From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Yufen Yu <yuyufen@huawei.com>, Josef Bacik <jbacik@fb.com>,
David Sterba <dsterba@suse.cz>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux F2FS Dev Mailing List
<linux-f2fs-devel@lists.sourceforge.net>,
Chris Mason <clm@fb.com>, Jaegeuk Kim <jaegeuk@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [GIT PULL] f2fs update for 4.16-rc1
Date: Tue, 3 Apr 2018 07:20:29 -0700 [thread overview]
Message-ID: <20180403142029.GM388343@devbig577.frc2.facebook.com> (raw)
In-Reply-To: <20180403122919.3c503f74@canb.auug.org.au>
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
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>,
Jaegeuk Kim <jaegeuk@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux F2FS Dev Mailing List
<linux-f2fs-devel@lists.sourceforge.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Yufen Yu <yuyufen@huawei.com>, David Sterba <dsterba@suse.cz>
Subject: Re: [GIT PULL] f2fs update for 4.16-rc1
Date: Tue, 3 Apr 2018 07:20:29 -0700 [thread overview]
Message-ID: <20180403142029.GM388343@devbig577.frc2.facebook.com> (raw)
In-Reply-To: <20180403122919.3c503f74@canb.auug.org.au>
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
next prev parent reply other threads:[~2018-04-03 14:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-30 22:32 [GIT PULL] f2fs update for 4.16-rc1 Jaegeuk Kim
2018-01-30 22:32 ` Jaegeuk Kim
2018-01-30 22:54 ` Stephen Rothwell
2018-01-31 0:25 ` Jaegeuk Kim
2018-01-31 0:25 ` Jaegeuk Kim
2018-01-31 22:25 ` Stephen Rothwell
2018-03-13 23:17 ` Stephen Rothwell
2018-04-03 2:29 ` Stephen Rothwell
2018-04-03 14:20 ` Tejun Heo [this message]
2018-04-03 14:20 ` Tejun Heo
2018-04-03 14:45 ` Stephen Rothwell
2018-05-02 22:42 ` Stephen Rothwell
2018-05-03 9:49 ` David Sterba
2018-06-18 3:38 ` Stephen Rothwell
2018-06-18 18:05 ` Chris Mason
2018-06-18 18:05 ` Chris Mason
2018-06-20 23:26 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180403142029.GM388343@devbig577.frc2.facebook.com \
--to=tj@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--cc=jaegeuk@kernel.org \
--cc=jbacik@fb.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=yuyufen@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.