From: Mike Snitzer <snitzer@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Alasdair G Kergon <agk@redhat.com>, Jens Axboe <axboe@kernel.dk>,
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 device-mapper tree with the block tree
Date: Fri, 1 Apr 2022 12:28:50 -0400 [thread overview]
Message-ID: <YkcoQh7jzltS8wiW@redhat.com> (raw)
In-Reply-To: <20220401052009.GA9398@lst.de>
On Fri, Apr 01 2022 at 1:20P -0400,
Christoph Hellwig <hch@lst.de> wrote:
> On Thu, Mar 31, 2022 at 09:44:25AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the device-mapper tree got a conflict in:
> >
> > include/linux/bio.h
> >
> > between commit:
> >
> > 57c47b42f454 ("block: turn bio_kmalloc into a simple kmalloc wrapper")
> >
> > from the block tree and commit:
> >
> > 135eaaabd22a ("block: allow using the per-cpu bio cache from bio_alloc_bioset")
>
> Isn't this something Jens already had queued up in the block tree?
>
Yes, but Jens hasn't staged 5.19 commits taken early in linux-next
yet. So I just left the changes in linux-dm.git's for-next to get
coverage in the interim.
Mike
next prev parent reply other threads:[~2022-04-01 16:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 22:44 linux-next: manual merge of the device-mapper tree with the block tree Stephen Rothwell
2022-04-01 5:20 ` Christoph Hellwig
2022-04-01 16:28 ` Mike Snitzer [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-28 3:14 Stephen Rothwell
2022-07-28 3:23 ` Ming Lei
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
2015-09-02 2:39 Stephen Rothwell
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=YkcoQh7jzltS8wiW@redhat.com \
--to=snitzer@kernel.org \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--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).