projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5766650) | patch
Ceph: remove left-over reject file
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2014 02:47:01 +0000 (18:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2014 02:47:01 +0000 (18:47 -0800)
commit44e8967d591686463e84a88b46b03beba3ab49fb
treeb2fc962f8d37b6dd1e40f471550dd7801f86b1actree | snapshot
parent57666509b70030a9483d13222bfec8eec5db07dfcommit | diff
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>
fs/ceph/super.h.rej [deleted file] blob | history
John Crispins staging tree