From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 419A5C433EF
	for <linux-next@archiver.kernel.org>; Fri,  1 Apr 2022 05:20:15 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S241451AbiDAFWC (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 1 Apr 2022 01:22:02 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59034 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S237334AbiDAFWB (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 1 Apr 2022 01:22:01 -0400
Received: from verein.lst.de (verein.lst.de [213.95.11.211])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C072A60AB2;
        Thu, 31 Mar 2022 22:20:12 -0700 (PDT)
Received: by verein.lst.de (Postfix, from userid 2407)
        id 44CC068AFE; Fri,  1 Apr 2022 07:20:09 +0200 (CEST)
Date:   Fri, 1 Apr 2022 07:20:09 +0200
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Alasdair G Kergon <agk@redhat.com>,
        Mike Snitzer <snitzer@kernel.org>,
        Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
        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: <20220401052009.GA9398@lst.de>
References: <20220331094425.0a9e0b92@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220331094425.0a9e0b92@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

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?