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 B141FC001B0 for ; Mon, 7 Aug 2023 18:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230218AbjHGSQ2 (ORCPT ); Mon, 7 Aug 2023 14:16:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229619AbjHGSQ2 (ORCPT ); Mon, 7 Aug 2023 14:16:28 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBC73171E for ; Mon, 7 Aug 2023 11:16:26 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2680edb9767so1016500a91.0 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=bJeKV+hMo6PYZBH3m1BQAOSajRlCP/CjoEwN6wIUCwv+pbwLTGupIrYE3NBAEa5z5a iyXKnHaK3zSU2mlFOk+b5+mV2gYloh9S5EBzq2sd4/vYmNF3ghxClQqJaFUUtpMEUkQR URz81lwBWwCCGKMCBYTTjLx2yNHoCOK/atQQK7J4g4fgyuMrU3WJDrVC5LDacaaU5Vei vfXAoDo0U01xtYVi3A5Ed/c6wMW32qVaOtPUtzsYixlFNFHwH2tbYpJgZ8tN+T+sONGm 8wWy8g9qRLWz0rlE7TIKUT8lM1mQP0Qu9X4R54uWPWOACsIfmqgpIk+wjKf1oypxA5es y0Zg== X-Gm-Message-State: ABy/qLYAboER6oJiWXdLHJMq4xlK4VAUnhmUpToB5wGGNcz9Tl/1u+lc KTdSJO7zWQJ5L2HB8Fd4FKIZ1Q== X-Google-Smtp-Source: APBJJlFVbkymLFOT/pjbfQRXS7wM3unL75yLMeFsY1s4Ndwc4JM9eAPrNzM57PDrDtPwd/jwX5C8WQ== 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 Precedence: bulk List-ID: X-Mailing-List: linux-next@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