From patchwork Mon Jun 26 03:04:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 112723 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7227248vqr; Sun, 25 Jun 2023 20:55:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ob6U9NLMtdtbFhQWX7QnqqImMd6bQNfBuzcX5Hg61hJ2abXjrUsASqtfw+KVi3FcCPcgd X-Received: by 2002:a17:907:318c:b0:987:e230:690 with SMTP id xe12-20020a170907318c00b00987e2300690mr22947963ejb.57.1687751730164; Sun, 25 Jun 2023 20:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687751730; cv=none; d=google.com; s=arc-20160816; b=WonMf2og6qqDio+fCIXEwIRo2bawiA8CYuEu4hhVsXnQs2pvGZRNUTBIX55rnwFH2A gbF0T8lPlodY6P6Z76mtVPExpqk/RJ8P9PDrp45hjEQduX2jztkGcQn3s1iVGYgVUHbX o9u0lWizuakL8YlRh6U7CeysUpggA3aZLCHwQGpj1drI4BsGvhFuVMqzbKvvnmzU+oZE smwR6/4TbHPTAzczrhmOyiu3mWLb8FOeoTOOx+Ete9HQsQuXCMQIjfvmzONLCuRLjBz1 MkNyE5ZU6XCOMzoLfzT32jKzTzGwLXJOfjjy+RcZ4Qmhjps9COofvvkF9/sJJZI/wFct DCcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=nW+gk4tqRBDSjlpCVThkyz/Is6m0YP4thr/RaTzC5Tw=; fh=2gUfqjAJtH/1HHPdlNREDMmxw7i6dW17ouw2+b8jcQU=; b=bcf3McWs/ljmboCMnX09NdL9ScmO09mewdVMmHZXS69tXWMERc2KTrQuHmL5OAPMEo Dhm8DcO03pxcrDyjlBw7Ptrnx9TyRzVOEbVQohFj3DnOysTxUABP2mda3PK15/G+Ycay Yr0UWokMjLe7yz81jNhNMASNwBZjxUHMF8KSdws3zrPNVcOs803ap/VPz0UWYYWsvnTh puqBoViNbQp2tGkVUpFtSxTJ0plnOI8OASQ5oDFKCmC68RF5oiA6A4h6cvvFl8flRQPk tdBZCRfC9J8gYW842ip45h4D6um/V3T7G4iTZ42xdU/HXAYvq4G1PekOnuqoMfcNoN7X Caqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=iPtnMJv9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ch26-20020a170906c2da00b009888b517932si2343221ejb.333.2023.06.25.20.55.06; Sun, 25 Jun 2023 20:55:30 -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=@canb.auug.org.au header.s=201702 header.b=iPtnMJv9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230284AbjFZDEQ (ORCPT + 99 others); Sun, 25 Jun 2023 23:04:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbjFZDEN (ORCPT ); Sun, 25 Jun 2023 23:04:13 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 502A51A7; Sun, 25 Jun 2023 20:04:12 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QqCNp1hgvz4wZv; Mon, 26 Jun 2023 13:04:10 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687748650; bh=nW+gk4tqRBDSjlpCVThkyz/Is6m0YP4thr/RaTzC5Tw=; h=Date:From:To:Cc:Subject:From; b=iPtnMJv9ZU5Lef7TGbo///iWdCz+amklWeLzzJmeSVNaNd6qrU827kqNnXDW1aTCp /wsQMOOotg2JJTCK+hKBeaR859X7uctmty522NDxUdVeO8Qdxlo2dszicaFOAoTvQr /Xyp9B3l+QgZgfKs7etT6qXNoex4/54Uy3waOm3cAJ0YRhOLrTHgMl7Jam3cefJ7oW iDvlIP9dDQEdGipiW7b3d0W6z7yEA3hd7t0wr64dOCLxNGeog5ABMkrm5MPTor2M76 ejG1gbBuNSdpSEUVJSSXtt5bUi1RWzFuzVYwBGInBplv4vnfWKJfKe86V85ave1tZe lzUpBoobeAKNg== Date: Mon, 26 Jun 2023 13:04:09 +1000 From: Stephen Rothwell To: Jens Axboe Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the block tree with Linus' tree Message-ID: <20230626130409.1ae2b54e@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769735957704122170?= X-GMAIL-MSGID: =?utf-8?q?1769735957704122170?= Hi all, Today's linux-next merge of the block tree got a conflict in: io_uring/net.c between commit: 78d0d2063bab ("io_uring/net: disable partial retries for recvmsg with cmsg") from Linus' tree and commit: 88fc8b8463b0 ("io_uring/net: initalize msghdr->msg_inq to known value") from the block tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc io_uring/net.c index 4b8e84768d2a,369167e45fa8..000000000000 --- a/io_uring/net.c