From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 5DD71C433EF for ; Fri, 1 Apr 2022 16:44:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349365AbiDAQqS (ORCPT ); Fri, 1 Apr 2022 12:46:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349466AbiDAQqJ (ORCPT ); Fri, 1 Apr 2022 12:46:09 -0400 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C77EAAA025 for ; Fri, 1 Apr 2022 09:28:53 -0700 (PDT) Received: by mail-qk1-f171.google.com with SMTP id g8so2539747qke.2 for ; Fri, 01 Apr 2022 09:28:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/oJPJBj5S0bapYKasyhopBzSNDWA25qTBcTqIl6bNLc=; b=KlFfJCRQiUF7QiwmMNyst5gt57+vcKqvMz44i/i5Ao1axjRtQT/hwLExwD1HJw3/QU B3udqyhYxf+hbtztjJ/cmPj05wGZgZUknvG8ffIWn/VV26zC8D0/Hv7uaaODrOx1S0Gk UqeUYcm1DAjMJZfT7QOEN3S23g5dH2+3pRNS06rDVdbM5UAI9SIQINrg1JkEXFZYfl02 bX0t5HEoyFjr+Riyq388Bu6sZEEGfbqXrWG2bW1Gke+OHH40sunqIih9PVpYNJbkcpwm jTW+1vNBroBNv89yK9uX6jkvCrLy1IBNkQHXrf8mRFGKe/KmU41hxH6vPGny1DxuIA3p kBNA== X-Gm-Message-State: AOAM532bx4fn8A0iQb+GHfOUDoevzRMaLSBVGpTxsgYHYFHKEo7LOa/w rePJrIMijyM1qLbTlIUI8LbFBC0vOx8h X-Google-Smtp-Source: ABdhPJyTu2CWqNhv6gAWV/qlK3Su+tfFp91FXbCJ/z6jOpdyiPtszIXCFQY1MO4rOV5b4NeYDmKFxg== X-Received: by 2002:a37:ef13:0:b0:680:fc96:f63a with SMTP id j19-20020a37ef13000000b00680fc96f63amr7090566qkk.248.1648830532970; Fri, 01 Apr 2022 09:28:52 -0700 (PDT) Received: from localhost (pool-68-160-176-52.bstnma.fios.verizon.net. [68.160.176.52]) by smtp.gmail.com with ESMTPSA id n131-20020a372789000000b0067bce1ac001sm1509772qkn.71.2022.04.01.09.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 09:28:52 -0700 (PDT) Date: Fri, 1 Apr 2022 12:28:50 -0400 From: Mike Snitzer To: Christoph Hellwig Cc: Stephen Rothwell , Alasdair G Kergon , Jens Axboe , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the device-mapper tree with the block tree Message-ID: 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 01 2022 at 1:20P -0400, Christoph Hellwig 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