Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 1 Apr 2022 12:28:50 -0400
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
Message-ID: <YkcoQh7jzltS8wiW@redhat.com>
References: <20220331094425.0a9e0b92@canb.auug.org.au>
 <20220401052009.GA9398@lst.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220401052009.GA9398@lst.de>
Precedence: bulk

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