From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shaohua Li <shli@kernel.org>, Jens Axboe <axboe@kernel.dk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>, Guoqing Jiang <gqjiang@suse.com>
Subject: linux-next: manual merge of the md tree with the block tree
Date: Tue, 13 Jun 2017 14:33:01 +1000 [thread overview]
Message-ID: <20170613143301.0c4a80f9@canb.auug.org.au> (raw)
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5.c
between commit:
4e4cbee93d56 ("block: switch bios to blk_status_t")
from the block tree and commit:
66a8066d55fd ("md: simplify code with bio_io_error")
from the md tree.
I fixed it up (the latter removed code updated by the former) 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.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-06-13 4:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 4:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-31 4:34 linux-next: manual merge of the md tree with the block tree Stephen Rothwell
2017-08-29 4:13 Stephen Rothwell
2017-04-12 2:31 Stephen Rothwell
2017-04-10 2:08 Stephen Rothwell
2017-04-10 2:03 Stephen Rothwell
2016-11-23 2:17 Stephen Rothwell
2016-11-22 4:50 Stephen Rothwell
2016-06-14 3:52 Stephen Rothwell
2016-06-14 3:52 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2014-01-15 4:07 Stephen Rothwell
2014-01-15 5:30 ` NeilBrown
2012-09-21 2:49 Stephen Rothwell
2011-10-07 3:06 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=20170613143301.0c4a80f9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=gqjiang@suse.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shli@kernel.org \
/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).