tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Ceph: remove left-over reject file

Neither Sage nor I noticed that Zheng Yan had mistakenly committed
fs/ceph/super.h.rej as part of commit 31c542a199d7 ("ceph: add inline
data to pagecache").

Remove it.

Requested-by: Yan, Zheng <ukernel@gmail.com>
Cc: Sage Weil <sweil@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Linus Torvalds 44e8967d 57666509

-10
-10
fs/ceph/super.h.rej
··· 1 - --- fs/ceph/super.h 2 - +++ fs/ceph/super.h 3 - @@ -254,6 +255,7 @@ 4 - spinlock_t i_ceph_lock; 5 - 6 - u64 i_version; 7 - + u64 i_inline_version; 8 - u32 i_time_warp_seq; 9 - 10 - unsigned i_ceph_flags;