| Message ID | 20231201094705.1ee3cab8@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp733090vqy;
Thu, 30 Nov 2023 14:47:15 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEVQxwlp6Lu1wcTaZY7zc/twsQoYNxFoYbm+beWS9k68OKnSGb2l6QN6/3uY57yeoWlVVaj
X-Received: by 2002:a17:902:c946:b0:1cf:a17d:14ee with SMTP id
i6-20020a170902c94600b001cfa17d14eemr26215438pla.28.1701384435303;
Thu, 30 Nov 2023 14:47:15 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1701384435; cv=none;
d=google.com; s=arc-20160816;
b=09wgTLpSlt2gUoqUA0dC0pXEXnc4maK1tJQr1rHjrgtKtwYPXdUFdCZ75ZhuhjJzvn
y9/bxFI1bYSVcWh4QR9yWdVUNxJcd55poilcHSRsQ5N60Z6v7owSGqyMlzMlxg485ugX
1Q+mwSytSNAypLr4n083Ursmydv1rBrKSzVOKrqzQKs4TBOVeuJzeqSWYlNtKPwEFYub
pCgqP2SqKtdKXmN/xTr27GC858cjpY7lL5gWRAjgfNbHiE/1uOlZX9vzj/lN25gAr/Az
kPTP9bCRvDisK0Aa4xqrFbStHH8cZDUxJeEgwGw+x00M532y4vONa4OkTRU55AgfJGFu
2kFg==
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=8dLRpQZRJvy3YV8A/Ir3qriNVtOM2tI73+ACdhrr2rQ=;
fh=ggogwfWF/2eMJzM0xFi5t+/1O0O5iMtSpytOHy0yFbY=;
b=pQgVrjBD4yosHCaM4NWOq5Bk0Ca0PpLQOXz0oU8Bz4ZpuQ9ahk4j7P37Y0rVKDqs+j
dyk42k2NhB/m89pasjHpz/29lpRpefRodWZcsC4kR7YPd7CUnP/034PAnVcXJRJ3mOlL
f74n1urampY8mSOnMSfxy2oZVlRkOKQiSiDUkM4c2GarPIwHxnrIEX8SMRsRBxrsr3PC
aRpy94W+ZHJx9kO+SiHu2uI1YmA/rY25UhCa06vxIt/4AAB/GYLK6kwP+URIkNgpQXlO
lbDSbjJxL0GxITDfXbYVDYmxCJP4iqP9TNm3VnqCwTm7Xt5S1gR7g3oZpapRGcSHet3C
M3hQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lTSJ9oqe;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7])
by mx.google.com with ESMTPS id
u14-20020a170903124e00b001cc467f87f8si2112454plh.381.2023.11.30.14.47.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 30 Nov 2023 14:47:15 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 as permitted sender)
client-ip=2620:137:e000::3:7;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lTSJ9oqe;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 4B48B804E789;
Thu, 30 Nov 2023 14:47:14 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1377192AbjK3WrF (ORCPT <rfc822;ruipengqi7@gmail.com>
+ 99 others); Thu, 30 Nov 2023 17:47:05 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37934 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230261AbjK3WrE (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 30 Nov 2023 17:47:04 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4074410FC;
Thu, 30 Nov 2023 14:47:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1701384428;
bh=8dLRpQZRJvy3YV8A/Ir3qriNVtOM2tI73+ACdhrr2rQ=;
h=Date:From:To:Cc:Subject:From;
b=lTSJ9oqeFzhFT3UE4ncKxNBoPrnAkqRQ29/P6OKM5MMD+PWU/8iK2IkAZT6ZaBbtN
RwE0ImCLsnrNOaiWrjLebU74Gi4JoF4X4zTYE3UBgU5ODRiiclwVyozQhzqyLTJoj/
q37lEhASL3BGtk9QwshjU+k9N4ukFGVnZDKBHR6GsdDJZ3F0Yks8mS9hjkqLMaABJD
GmoOg6f4oT9JKjP0EvkXqw6oUHEO1DDh8oF4ksVtrlpZkhw3zY/8LWJwJk0URcQYJS
pVQ1UDJh/7J6YUb0Lqk1b7O7NoJh+gUQZKJeKO25l7OjlbvSmdqIvNvsff7Pi/5xU/
6OhwYAKEF73KA==
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 4ShBCH3Jthz4xjd;
Fri, 1 Dec 2023 09:47:07 +1100 (AEDT)
Date: Fri, 1 Dec 2023 09:47:05 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stanislav Fomichev <sdf@google.com>
Subject: linux-next: manual merge of the bpf-next tree with the net-next
tree
Message-ID: <20231201094705.1ee3cab8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/g7K.f..gJSgW3O55nsC/Hs7";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]);
Thu, 30 Nov 2023 14:47:14 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784030885766526106
X-GMAIL-MSGID: 1784030885766526106
|
| Series |
linux-next: manual merge of the bpf-next tree with the net-next tree
|
|
Commit Message
Stephen Rothwell
Nov. 30, 2023, 10:47 p.m. UTC
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
Documentation/netlink/specs/netdev.yaml
between commit:
839ff60df3ab ("net: page_pool: add nlspec for basic access to page pools")
(and a few following)
from the net-next tree and commit:
48eb03dd2630 ("xsk: Add TX timestamp and TX checksum offload support")
from the bpf-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 Documentation/netlink/specs/netdev.yaml index 20f75b7d3240,00439bcbd2e3..000000000000 --- a/Documentation/netlink/specs/netdev.yaml