]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'ceph/testing'
authorJeff Layton <jlayton@kernel.org>
Mon, 29 Nov 2021 11:05:56 +0000 (06:05 -0500)
committerJeff Layton <jlayton@kernel.org>
Mon, 29 Nov 2021 11:05:57 +0000 (06:05 -0500)
1  2 
drivers/block/rbd.c
fs/ceph/file.c

Simple merge
diff --cc fs/ceph/file.c
Simple merge