diff --git a/fs/ceph/super.h.rej b/fs/ceph/super.h.rej deleted file mode 100644 index 88fe3dfadb29815acbf02dc022dfbd1224a45ab8..0000000000000000000000000000000000000000 --- 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;