From: Chao Yu <yuchao0@huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jens Axboe <axboe@kernel.dk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chao Yu <chao@kernel.org>, Christoph Hellwig <hch@lst.de>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the f2fs tree
Date: Thu, 3 Dec 2020 11:47:49 +0800 [thread overview]
Message-ID: <047a6e22-2e8a-4c36-bcbc-3108606c58ff@huawei.com> (raw)
In-Reply-To: <20201203144348.70f139a9@canb.auug.org.au>
On 2020/12/3 11:43, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/f2fs/checkpoint.c
> fs/f2fs/f2fs.h
> fs/f2fs/super.c
>
> between commit:
>
> 5c0602188dc7 ("f2fs: fix kbytes written stat for multi-device case")
>
> from the f2fs tree and commits:
>
> 8446fe9255be ("block: switch partition lookup to use struct block_device")
> 9499ffc75217 ("f2fs: remove a few bd_part checks")
>
> from the block tree.
>
> I fixed it up (I think, see below, fs/f2fs/f2fs.h and fs/f2fs/super.c
> used the versions from the f2fs tree) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
The fix looks good to me. :)
Thanks,
next prev parent reply other threads:[~2020-12-03 3:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 3:43 linux-next: manual merge of the block tree with the f2fs tree Stephen Rothwell
2020-12-03 3:47 ` Chao Yu [this message]
2020-12-03 3:57 ` Stephen Rothwell
2020-12-14 20:12 ` Stephen Rothwell
2020-12-17 1:50 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2016-11-22 3:42 Stephen Rothwell
2016-07-11 4:52 Stephen Rothwell
2016-06-20 2:37 Stephen Rothwell
2016-06-09 3:26 Stephen Rothwell
2016-06-09 3:34 ` Stephen Rothwell
2015-07-30 3:19 Stephen Rothwell
2014-01-06 6:03 Stephen Rothwell
2013-12-18 3:57 Stephen Rothwell
2013-12-12 2:57 Stephen Rothwell
2013-12-02 4:04 Stephen Rothwell
2013-11-26 1:00 Stephen Rothwell
2013-11-26 0:56 Stephen Rothwell
2013-11-01 3:29 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=047a6e22-2e8a-4c36-bcbc-3108606c58ff@huawei.com \
--to=yuchao0@huawei.com \
--cc=axboe@kernel.dk \
--cc=chao@kernel.org \
--cc=hch@lst.de \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).