From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alasdair G Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@redhat.com>, Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Joe Thornber <ejt@redhat.com>, Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the device-mapper tree with the block tree
Date: Wed, 2 Sep 2015 12:39:29 +1000 [thread overview]
Message-ID: <20150902123929.1b216311@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the device-mapper tree got a conflict in:
drivers/md/dm-cache-target.c
between commit:
4246a0b63bd8 ("block: add a bi_error field to struct bio")
from the block tree and commit:
cc7da0ba9c96 ("dm cache: fix use after freeing migrations")
from the device-mapper tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/md/dm-cache-target.c
index 7245071778db,f9d9cc6a094b..000000000000
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@@ -1358,9 -1352,10 +1352,10 @@@ static void issue_discard(struct dm_cac
b = to_dblock(from_dblock(b) + 1);
}
- bio_endio(bio, 0);
+ bio_endio(bio);
- cell_defer(mg->cache, mg->new_ocell, false);
+ cell_defer(cache, mg->new_ocell, false);
free_migration(mg);
+ wake_worker(cache);
}
static void issue_copy_or_discard(struct dm_cache_migration *mg)
next reply other threads:[~2015-09-02 2:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 2:39 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-28 3:14 linux-next: manual merge of the device-mapper tree with the block tree Stephen Rothwell
2022-07-28 3:23 ` Ming Lei
2022-03-30 22:44 Stephen Rothwell
2022-04-01 5:20 ` Christoph Hellwig
2022-04-01 16:28 ` Mike Snitzer
2021-08-10 1:55 Stephen Rothwell
2020-07-09 3:21 Stephen Rothwell
2020-05-22 5:17 Stephen Rothwell
2018-12-10 3:43 Stephen Rothwell
2018-12-10 3:55 ` Jens Axboe
2018-12-10 5:13 ` Mike Snitzer
2016-07-21 3:27 Stephen Rothwell
2016-07-18 4:09 Stephen Rothwell
2016-06-09 3:59 Stephen Rothwell
2016-06-09 4:02 ` Stephen Rothwell
2016-06-10 17:01 ` Mike Snitzer
2013-12-17 2:16 Stephen Rothwell
2010-07-06 4:33 Stephen Rothwell
2010-07-06 14:30 ` Mike Snitzer
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=20150902123929.1b216311@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=ejt@redhat.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=snitzer@redhat.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 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).