From patchwork Mon Oct 23 01:42:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 156629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1024781vqx; Sun, 22 Oct 2023 18:42:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWFgyEpJ2DyD11z/JfypAol2amYKu7tZ5IzfbTMc2XJdU3ydcvtUOzU7RbpIpX2heQYJ04 X-Received: by 2002:a05:6358:1aa3:b0:168:e68f:88b4 with SMTP id gm35-20020a0563581aa300b00168e68f88b4mr105803rwb.14.1698025346665; Sun, 22 Oct 2023 18:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698025346; cv=none; d=google.com; s=arc-20160816; b=GZugNmLWzdi5FqlaIl3JxkgJ2j4b6jNwZl4fNWovWGE3XJPX5SfMIwPJCd98I9k1Co sxYgo5/5ioCJcw46BQXhq7FCab5YRsj1vCe97qM8E1LXeJfQ4JQPFSZVw9yDLMbgw/cB j6YE3AD+nxef5ND88+YMCG1waSYjiKNEte9GutOAAr4ZSLPhf3aNS3zgBFhJQBaRRwQP p81rheUZJLv5yD+OeT8nIyuKghpqL1yIGqvM2VxbDteLnAQSvNBPPvmQD81ByGAo2JMc aHvpAWnNPAQ6jn6gcHxnonMCWxtDJo9rMgpoRFiFnJ78DiIve/Rp0f0x07mRF5jMnMd1 8k8w== 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=RaCCh9Z/e12DEo8pm9dRiMR3hb8GPa3Gm/pRDZSRVHw=; fh=prSOGNU5LItw9I12bmszh1yTxf0m4tuyDmN2CWHbdVo=; b=wn5nFVuJgagocs1nheb/WMuX0+5Kk6kwDniof4yeIFknnB4U6B74jqyHpKPeN1zNxP e/uZy+Z4gs0FbD+ypTuRhaBhuTWUrj7VZOtHidio3/TmmsUAdqTQxkJiodTlCFgKJyxR 7+0hnvB4nUwruhF/DYjepOImi+ge7Yc6HlmVj3NtJBxSdxDL38WjGNdF+QEYbQHyE8C+ eppb9kqIh5dxjau8KcmqMhlMVCZx+G9FviYIR/sfmmd79kzkaLCg88eNF4KkGzQp3CfI 87N1los19h099tyIC670SKw+Ttgxkumv6aIKonNy9rQ0Bw5thyobwrWg0SpxV6hb5wye tMSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=to97amS2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id l191-20020a6388c8000000b00578afd89ba6si5466217pgd.457.2023.10.22.18.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 18:42:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=to97amS2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 884778061CED; Sun, 22 Oct 2023 18:42:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233111AbjJWBmL (ORCPT + 26 others); Sun, 22 Oct 2023 21:42:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233032AbjJWBmK (ORCPT ); Sun, 22 Oct 2023 21:42:10 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE019F7; Sun, 22 Oct 2023 18:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698025322; bh=RaCCh9Z/e12DEo8pm9dRiMR3hb8GPa3Gm/pRDZSRVHw=; h=Date:From:To:Cc:Subject:From; b=to97amS2dqEJY+ViWtVaCnJwogGRHliuG4GPsnXBw+GT/zPOUuAE8nso6QQoQKwTA 9BmJz+KkcafJruoMcMMH6R9y3x1ygtAtw9qhiqPHT2FICRmwlaOEWtn1iwqDdM8TWc HQk3X1SYgWaAdeDV8tvJqQDst7eJWLNO4VmV1XWyMqEqziWTdale+JLIQMhVYlfNSw RZlk/MApmwS3s0kf/Ir4cHbLMz6escHItFqDi6sr28UeNy3YSjJ0QYHRKOnwKSTuRX dcVF19X0GUOGJJJY/KNA2DzC1zmLffiCOMi1erPhs0r77pV8sQFl/+dO683r5pDjON XEUEwF2FVv6zg== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SDHx62Vtqz4wd7; Mon, 23 Oct 2023 12:42:01 +1100 (AEDT) Date: Mon, 23 Oct 2023 12:42:00 +1100 From: Stephen Rothwell To: Jens Axboe Cc: Hannes Reinecke , Keith Busch , Linux Kernel Mailing List , Linux Next Mailing List , Sagi Grimberg Subject: linux-next: manual merge of the block tree with Linus' tree Message-ID: <20231023124200.38dd410b@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 22 Oct 2023 18:42:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780508626038547370 X-GMAIL-MSGID: 1780508626038547370 Hi all, Today's linux-next merge of the block tree got a conflict in: drivers/nvme/target/tcp.c between commit: d920abd1e7c4 ("nvmet-tcp: Fix a possible UAF in queue intialization setup") from Linus' tree and commit: 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall") from the block tree. I fixed it up (I am not sure this is necessary - 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 drivers/nvme/target/tcp.c index 197fc2ecb164,4336fe048e43..000000000000 --- a/drivers/nvme/target/tcp.c