On Wed, Dec 17, 2014 at 6:25 PM, Yan, Zheng <uker...@gmail.com> wrote: > my commit "ceph: add inline data to pagecache" incidentally adds > fs/ceph/super.j.rej. please remove it from your branch. sorry for > the inconvenience
I wish I hadn't pulled it so quickly, and could have fixed it up as part of the merge commit, but I pushed a separate commit to remove it. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/