Received: by 2002:a05:6359:6284:b0:131:369:b2a3 with SMTP id se4csp3427673rwb; Mon, 7 Aug 2023 13:25:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFUzs9kmd+PdBEqFuhQ0Gti+xCL+sAmCXb0wbDEUn1O6sEDXqMcuvzgdGCL+wFTROeqFOoR X-Received: by 2002:a17:90b:18d:b0:268:1217:46bc with SMTP id t13-20020a17090b018d00b00268121746bcmr9838704pjs.11.1691439923287; Mon, 07 Aug 2023 13:25:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691439923; cv=none; d=google.com; s=arc-20160816; b=cehd0y1b0M1KUotA7GoSvJeYxhRhyJoJsdM60XfiSLqx8IOLfuTiN6uGFjZuMeOJbd Tz46R8psgtkOm5b4au7RUAQ4boZdkf3wX3R+Nj9Kw323OhDORisRShwEWBsFCRgZTe3x FeXmobe0AYIIm9+OeLeNj4gGXj91Y2QEYHkQCfQtZGuerCeo3thf5lgQb2QRLd4jkfvC r+fUwnvptCuxdxRTXflX6CBw7Q/ZtK5gM9RtuBm4RGpU0bZIr4eraSDSoamQeurZfQq/ 4jIk6XRs1mSnzgFvAV/YvY/UUm2upvnmGxUYd9CoSnGiWSYp1/3TMBD3unZ4qUx8zyli L2mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=/q4TjxxI1B9tc9NK0ysQsqSRDTxO2q8K4DUCy+lY3jg=; fh=JKkzyVf8x5dwTfsgu3Ghc3wFQnBqxsW4nEqFE1PuyYo=; b=PHWpFYdKVt/vZLxIWjpYX4R20416lGrQX1YUOPuGVrh+VIosjMFGNY05Ksg1g6qSHQ 98tprbFyGAjwa4MpWUXhgwXzGweLSNj6Mfm+Im/IcU0N5PNig9gfT371EXH31xpZYNJA 1VdeUtFWvLv3IckLlzdisWAWh6Cbbj2zPSBbPN5f7mT9YNUhOygv8azKinwC89WH/hzp Cp1N2uHJo8ECx9Ze2isfimJ4Et5NO0xTHfCU1Mlh3lC+VxKCexO2IlvUUIlTYkCDegfU mus0KUUqJgbA+qB0TL0dtCJHPzQerDKc1E7MWwjdKA+V2s+H1JuDuH0zsavJRgxz8kDr r2Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=ZHm0E6gC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d8-20020a17090a628800b00263e8027e64si9398456pjj.138.2023.08.07.13.25.11; Mon, 07 Aug 2023 13:25:23 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=ZHm0E6gC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229619AbjHGSQ3 (ORCPT + 99 others); Mon, 7 Aug 2023 14:16:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbjHGSQ2 (ORCPT ); Mon, 7 Aug 2023 14:16:28 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC2EF1726 for ; Mon, 7 Aug 2023 11:16:26 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-26890669c8eso1018426a91.1 for ; Mon, 07 Aug 2023 11:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1691432186; x=1692036986; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=/q4TjxxI1B9tc9NK0ysQsqSRDTxO2q8K4DUCy+lY3jg=; b=ZHm0E6gCIT3guFsyTN+9ko/ZfAVeXA06TaGhqrJU6Z1duQ4H4mOs/YYBAuo9Ezgff+ BJW1myC9fSPHEBFRVa69oMiB1BDGnfySVJROq2md92FnSLbj0ztldbM1Rilptl/OGYfq O2IiEtH+44E2rndBHhKND7T+of670U83MaOsv5yKHL546HVZrLYIXRPSxBsV3p2EY7fS YfTppA7bJE2XZnsm775YPmeLeRvL6lq4C3JU/RhS3unfOjq1FtWM9DRMyKd8TATajEjt HIkbeBY7euBxfZ5J/kCOkF9kiA3kjEnvzWEA5DjzilXb+BYuV95nZqSVhnY/JE0+kWvH rB2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691432186; x=1692036986; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/q4TjxxI1B9tc9NK0ysQsqSRDTxO2q8K4DUCy+lY3jg=; b=kYC9KZoSXAoS9AW7AuY7ZjOodI3+VFb8Uh6vP7r1Vm71Dpr2DX0QUXEWL8zPXS2keS kZzpX78MS03PsOtiP3MrNkR4ri4eTb0pN5ZjNpAG2wo7+zKSEdZTNT43O88ZYz76TqP7 P4N1SFeM/n8XMB0jBAixfS0sodCMWc9oQY8eDRs+UiIwqZzEgKnw47JXprSYkNBHEtyz nuGCQ4Seob3ZYAffOt0cxtiMzOU+8FOGr5UNdWNEBifZxFs4/XdfjxKHyO7yz4Q63nve +Arq0EYQHoJrPkEC9LjH54jnwWVhGfOROqDC9ZTj5QCyGdmgNZtcw8gdz/pzLkSGOV2x JKKA== X-Gm-Message-State: ABy/qLaejge+tRQd6vfm/1XDRARXaVDE8yJ9d3LhEWw472ktLLWqFXZa ubXA7AVJv2uokRnZC2Wm8xpmkQWHmif+w1LR9d8= X-Received: by 2002:a17:90a:1348:b0:268:38a7:842e with SMTP id y8-20020a17090a134800b0026838a7842emr26021763pjf.2.1691432186424; Mon, 07 Aug 2023 11:16:26 -0700 (PDT) Received: from [172.16.7.55] ([12.221.160.50]) by smtp.gmail.com with ESMTPSA id q11-20020a17090311cb00b001bb8895848bsm7258030plh.71.2023.08.07.11.16.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Aug 2023 11:16:25 -0700 (PDT) Message-ID: Date: Mon, 7 Aug 2023 12:16:24 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Subject: Re: linux-next: duplicate patches in the block tree Content-Language: en-US To: Stephen Rothwell , "Darrick J. Wong" Cc: Linux Kernel Mailing List , Linux Next Mailing List References: <20230807145120.6c2080a0@canb.auug.org.au> From: Jens Axboe In-Reply-To: <20230807145120.6c2080a0@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NICE_REPLY_A,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/6/23 10:51?PM, Stephen Rothwell wrote: > Hi all, > > The following commits are also in the iomap tree as different commits > (but the same patches): > > 634aae6c3333 ("iomap: support IOCB_DIO_CALLER_COMP") > 4d184b3fd1ab ("io_uring/rw: add write support for IOCB_DIO_CALLER_COMP") > d6cb42b086fe ("fs: add IOCB flags related to passing back dio completions") > 7e8dcad9affa ("iomap: add IOMAP_DIO_INLINE_COMP") > 448373a0bd1d ("iomap: only set iocb->private for polled bio") > 661687f531ef ("iomap: treat a write through cache the same as FUA") > 0e40c9e86011 ("iomap: use an unsigned type for IOMAP_DIO_* defines") > 062ef9f4932e ("iomap: cleanup up iomap_dio_bio_end_io()") > > These are commits > > 8c052fb3002e ("iomap: support IOCB_DIO_CALLER_COMP") > 099ada2c8726 ("io_uring/rw: add write support for IOCB_DIO_CALLER_COMP") > 9cf3516c29e6 ("fs: add IOCB flags related to passing back dio completions") > 7b3c14d1a96b ("iomap: add IOMAP_DIO_INLINE_COMP") > daa99c5a3319 ("iomap: only set iocb->private for polled bio") > 3a0be38cc84d ("iomap: treat a write through cache the same as FUA") > 44842f647346 ("iomap: use an unsigned type for IOMAP_DIO_* defines") > 3486237c6fe8 ("iomap: cleanup up iomap_dio_bio_end_io()") > > in the iomap tree. I'll drop them on my side since Darrick has them merged now. -- Jens Axboe