From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>,
Linus Walleij <linus.walleij@linaro•org>
Subject: linux-next: manual merge of the mmc tree with the block tree
Date: Mon, 28 Nov 2016 13:12:11 +1100 [thread overview]
Message-ID: <20161128131211.55f096b8@canb.auug.org.au> (raw)
Hi Ulf,
Today's linux-next merge of the mmc tree got a conflict in:
drivers/mmc/card/block.c
between commit:
e806402130c9 ("block: split out request-only flags into a new namespace")
from the block tree and commit:
95105fc9ffbb ("mmc: block: delete packed command support")
from the mmc 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
diff --cc drivers/mmc/card/block.c
index ae9cbe6101be,86ff28f84698..000000000000
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@@ -2114,28 -1728,18 +1728,18 @@@ static int mmc_blk_issue_rw_rq(struct m
return 1;
cmd_abort:
- if (mmc_packed_cmd(mq_rq->cmd_type)) {
- mmc_blk_abort_packed_req(mq_rq);
- } else {
- if (mmc_card_removed(card))
- req->rq_flags |= RQF_QUIET;
- while (ret)
- ret = blk_end_request(req, -EIO,
- blk_rq_cur_bytes(req));
- }
+ if (mmc_card_removed(card))
- req->cmd_flags |= REQ_QUIET;
++ req->rq_flags |= RQF_QUIET;
+ while (ret)
+ ret = blk_end_request(req, -EIO,
+ blk_rq_cur_bytes(req));
start_new_req:
if (rqc) {
if (mmc_card_removed(card)) {
- rqc->cmd_flags |= REQ_QUIET;
+ rqc->rq_flags |= RQF_QUIET;
blk_end_request_all(rqc, -EIO);
} else {
- /*
- * If current request is packed, it needs to put back.
- */
- if (mmc_packed_cmd(mq->mqrq_cur->cmd_type))
- mmc_blk_revert_packed_req(mq, mq->mqrq_cur);
-
mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq);
mmc_start_req(card->host,
&mq->mqrq_cur->mmc_active, NULL);
next reply other threads:[~2016-11-28 2:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-28 2:12 Stephen Rothwell [this message]
2016-11-29 9:13 ` linux-next: manual merge of the mmc tree with the block tree Ulf Hansson
2016-11-29 9:16 ` Christoph Hellwig
2016-11-29 9:22 ` Ulf Hansson
-- strict thread matches above, loose matches on Subject: below --
2017-06-13 4:19 Stephen Rothwell
2022-05-11 2:42 Stephen Rothwell
2024-02-20 1:01 Stephen Rothwell
2024-02-20 8:04 ` Christoph Hellwig
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=20161128131211.55f096b8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ulf.hansson@linaro$(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