From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Jens Axboe <axboe@kernel•dk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Adam Manzanares <adam.manzanares@hgst•com>,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the libata tree with the block tree
Date: Tue, 8 Nov 2016 16:58:54 +1100 [thread overview]
Message-ID: <20161108165854.0872cd8b@canb.auug.org.au> (raw)
Hi Tejun,
Today's linux-next merge of the libata tree got a conflict in:
block/blk-core.c
between commits:
e806402130c9 ("block: split out request-only flags into a new namespace")
ef295ecf090d ("block: better op and flags encoding")
from the block tree and commit:
5dc8b362a237 ("block: Add iocontext priority to request")
from the libata tree.
I fixed it up (see below) 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
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@@ -1152,11 -1153,11 +1152,12 @@@ static struct request *__get_request(st
blk_rq_init(q, rq);
blk_rq_set_rl(rq, rl);
+ blk_rq_set_prio(rq, ioc);
- req_set_op_attrs(rq, op, op_flags | REQ_ALLOCED);
+ rq->cmd_flags = op;
+ rq->rq_flags = rq_flags;
/* init elvpriv */
- if (op_flags & REQ_ELVPRIV) {
+ if (rq_flags & RQF_ELVPRIV) {
if (unlikely(et->icq_cache && !icq)) {
if (ioc)
icq = ioc_create_icq(ioc, q, gfp_mask);
reply other threads:[~2016-11-08 5:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20161108165854.0872cd8b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=adam.manzanares@hgst$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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