[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20180403142029.GM388343@devbig577.frc2.facebook.com>
Date: Tue, 3 Apr 2018 07:20:29 -0700
From: Tejun Heo <tj@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Chris Mason <clm@...com>, Josef Bacik <jbacik@...com>,
Jaegeuk Kim <jaegeuk@...nel.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Linux F2FS Dev Mailing List
<linux-f2fs-devel@...ts.sourceforge.net>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Yufen Yu <yuyufen@...wei.com>, David Sterba <dsterba@...e.cz>
Subject: Re: [GIT PULL] f2fs update for 4.16-rc1
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
Powered by blists - more mailing lists