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?

Thanks.

-- 
tejun

Reply via email to