From patchwork Mon Jul 31 00:26:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 128304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1733165vqg; Sun, 30 Jul 2023 18:02:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlGuLK65rCgFXOPRY37a/58BW/s53JidxBGK01Q+ARL5OxIVGtSWzNo2Els0qpKX7JkU9I8Y X-Received: by 2002:a05:6358:921:b0:139:c4ee:8680 with SMTP id r33-20020a056358092100b00139c4ee8680mr1502163rwi.16.1690765339186; Sun, 30 Jul 2023 18:02:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690765339; cv=none; d=google.com; s=arc-20160816; b=rVcsn6PVYt3JwMkdhibj59vL2BOCm9b688wDZ3aZnKVHC7fZQJfANQ5/A6S5tXtpjZ X6VrKNIa5KpqEV7V+tQZxyycoBqdM5vb5bRtJzYsmXG6w5zs0Rf19qQCACf03yRkdkDu 7hXeJTcNUIAc8thyP+/xYV/iKLZZBCeqH91H7NLjki/kSgvkacU6YsN8HUMv9sZrFqg6 WAoqfo/wUOYgU1IuVXiPDqsoZZDdmgBzzz/z8jAktHTEyeT2a2jkk5U0CW5xFTmKGwEM LG5aREUTSTeL2anvtklUG5yEi5gW05MN+suMVQs5CkFcnnwSDrCKSzFYiU+g9c2Om2S9 7rvQ== 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=jVgBHko4/t4VVInw6sHfaCve6iYjTk+iGD9K7W3Ov68=; fh=nqzsO0y9uhopO4qrfj/rPjhsjt8Oj5aqnBxSR4awQlw=; b=jQLMdVic083dNH4+GhIh24saQMobu3e4nNPO7tWp8USZmmElhKIRurCwUPjpGnweff nZvCy5Mj2yGfPHy9+nWvcXGGrEpTy9fmVKKuK4kUyu4neg5bbEC/g6cKbZ18oxN4ipRV 2tSOHQZDpy5vGOLb+xkGMExvfn/G3zCGXeVmfthXW3tOUq50QP+Q8naURWCH+pciPOA0 fQa6vEfOplIDm/59K0QWPERF5/ubqtS/9Q4LH7ATPICSYt4GlRlu8bYQyeqDQtAcEVNQ uIPCsKb7/MOLiylu/mDrgm8CF4OSv6wdk80+o+dpe4GcY8bDV7La4KPShf86x/mYK+U0 g0Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=invuTBDQ; 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 j71-20020a63804a000000b00563e9eab24asi1745217pgd.405.2023.07.30.18.01.57; Sun, 30 Jul 2023 18:02:19 -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=invuTBDQ; 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 S229681AbjGaA0m (ORCPT + 99 others); Sun, 30 Jul 2023 20:26:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjGaA0l (ORCPT ); Sun, 30 Jul 2023 20:26:41 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25B861B2; Sun, 30 Jul 2023 17:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690763195; bh=jVgBHko4/t4VVInw6sHfaCve6iYjTk+iGD9K7W3Ov68=; h=Date:From:To:Cc:Subject:From; b=invuTBDQNwM6PesMNBB//vWOz1iqarqra+if+jSzKfYezCRTCIJ8mjsPpoFGjcHQ8 9pm1Et5VrNWm/D5ST3W4q9nhocGZPbkn4+keiYCietBiY7F+ASBpMaUD/IRH5UxvsM 2Kk6tYEWN8BwaYBsTJx3GjTz48ZZgqf6B+A3Z+PNGoWERTI23u5gKpq14bIAU7Ghdd liOkZXDnBei7CYvQIGXJOTu4HxakDINHToeLTE5mOK9UkGanx5fbOEv3BNfovYqlSd 5e28BUTsVRKkrRkcQhDkZ7RZCwVc34vnJI0WjwUrZxCUCete1rPKHakN5XyqnaetWr JXS0zuXOkj8Cw== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RDfDp2FQ8z4wb8; Mon, 31 Jul 2023 10:26:34 +1000 (AEST) Date: Mon, 31 Jul 2023 10:26:31 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Alexei Starovoitov , Eric Dumazet , Linux Kernel Mailing List , Linux Next Mailing List , Tirthendu Sarkar Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20230731102631.39988412@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,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: INBOX X-GMAIL-THRID: 1772895956269911284 X-GMAIL-MSGID: 1772895956269911284 Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/xdp/xsk.c between commit: 3c5b4d69c358 ("net: annotate data-races around sk->sk_mark") from the net tree and commit: b7f72a30e9ac ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path") from the net-next 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 net/xdp/xsk.c index b89adb52a977,4f1e0599146e..000000000000 --- a/net/xdp/xsk.c