Hi Tejun, On Tue, 3 Apr 2018 07:20:29 -0700 Tejun Heo <t...@kernel.org> wrote: > > Hello, Stephen. > > On Tue, Apr 03, 2018 at 12:29:19PM +1000, Stephen Rothwell wrote: > > > I am still applying this to the merge of the btrfs tree every day ... > > > > > > Commit > > > 578c647879f7 ("f2fs: implement cgroup writeback support") > > > was merged into Linus' tree on Jan 31. > > > > > > Here is the actual merge fix patch: > > Yeah, the merge fix looks correct to me. Depending on the merge > order, it can go either after the btrfs merge or the f2fs merge, I > guess. Stephen, beyond appyling the merge fix afterwards, is there > somethine else you are concerned about?
The f2fs part of the conflict was merged into Linus' tree on Jan 31, and I have been applying the conflict resolution patch for a whole release cycle i.e. the btrfs tree part of the conflict did not get merged during the last merge window, and has not been updated since then - in fact the btrfs tree (git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next) has not been updated or merged into Linus' tree since last December. :-( -- Cheers, Stephen Rothwell
pgpS1LxBdfEx9.pgp
Description: OpenPGP digital signature