From 44e8967d591686463e84a88b46b03beba3ab49fb Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 17 Dec 2014 18:47:01 -0800 Subject: [PATCH] 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 Cc: Sage Weil Signed-off-by: Linus Torvalds --- fs/ceph/super.h.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 fs/ceph/super.h.rej diff --git a/fs/ceph/super.h.rej b/fs/ceph/super.h.rej deleted file mode 100644 index 88fe3dfadb29..000000000000 --- a/fs/ceph/super.h.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- fs/ceph/super.h -+++ fs/ceph/super.h -@@ -254,6 +255,7 @@ - spinlock_t i_ceph_lock; - - u64 i_version; -+ u64 i_inline_version; - u32 i_time_warp_seq; - - unsigned i_ceph_flags; -- 2.20.1