| Message ID | 20231211110022.27926ad9@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 r17csp6749284vqy;
Sun, 10 Dec 2023 16:01:06 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEWa1v9W/vcbkaMNY/MvoDvVq/SHHJa7AWM8fExsHTFcfbxv9Xohx9jb2jKcSaeFEk51wnu
X-Received: by 2002:a17:902:ab1a:b0:1d0:ab46:4f28 with SMTP id
ik26-20020a170902ab1a00b001d0ab464f28mr3500432plb.23.1702252866251;
Sun, 10 Dec 2023 16:01:06 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702252866; cv=none;
d=google.com; s=arc-20160816;
b=JWBeOBn++vDnx6J6efI8iLweS9Uu+x/WSh9X2xJrD0u9rK6cepiN/qD5b5xDErA4L+
8WoDFsyT9+WVvSbYQyTnQxjGBZoyXtXwflz1yIg4ZbdYXQZarb5pWPdKTYo7ypbhkwyA
HQL/iTZ0tEqBmCqT2ry/KnupDxQSaJhIUPzT3EgZJ6T3ohIiGLis7P8ehX85WR/jT9R3
zcfiV5NXrLiDrpzeJexU/McDZEpZDrp5c25AkxiMoOyWoafcYrpHNq45duL+WImeh0ol
Nde7M11TcL5jBna4hZrsGgYbB2bATwJr8aLm33EfFgfyc782dLhQUPkbiZzJ0BClPBQw
ezjw==
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=tbae79Omvl8ykcHGOoBf4uvnrHXq+QXZq14ZKRwbxdA=;
fh=24LJxO39toz3PfBRKYRv7hBGCbUoDyHkQyZFTbxCCLY=;
b=WmN+MbVmiMjO1IdnQ/q3pnqnkDBXf7+vMj3U7Yi+TEOb+M4Yxms+dkyDSyyJE6WddC
FF3BZT3kLbppZu52bVWmKHPt9H91Lt37qUJAXkJTLp6jVb0lZ5P3p6V92A8Gu4EtQWts
AkwY+AUoutOAle3c2YcUxCxGFjejueZV6CFi+TUezoTfacGZPt2S5l4fBeEi+Kk+OGk2
md9rCjQemyfvuhu1VTnTi72OzPvrxJQkwAeptkMV8QtTSxlst1yFgBEOsP87UGl8XZDB
DKqmRxVWD3pPgzE75+perVS1mdAtKy6fXN45ttb5KEX6fLALp8YbRlZ6st5rdGkBgBIm
nG2g==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IXECbGYV;
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
h2-20020a170902f7c200b001d0b693ae03si5059710plw.500.2023.12.10.16.01.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Dec 2023 16:01:06 -0800 (PST)
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=IXECbGYV;
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 4E5C5807064A;
Sun, 10 Dec 2023 16:00:33 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230162AbjLKAAY (ORCPT <rfc822;hjfbswb@gmail.com> + 99 others);
Sun, 10 Dec 2023 19:00:24 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39740 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229483AbjLKAAX (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 10 Dec 2023 19:00:23 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A24E8E4;
Sun, 10 Dec 2023 16:00:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702252825;
bh=tbae79Omvl8ykcHGOoBf4uvnrHXq+QXZq14ZKRwbxdA=;
h=Date:From:To:Cc:Subject:From;
b=IXECbGYV2+JpQxsGnt3DwxFy4f+/2dwLs4N7mhsSb4rk/Xm3QybDSJGciI3d+aNDa
sSPThwNT708SC9LBPKC+TvLGe3vj46XZ0hB6kSuBAbX8FFsTk8HTrUp10aLccZ+tDA
jpqDNzAXJGasTO8+bEZN+zkc0iWuV5BFyYepSDzdA27SPTsaKL+sYAMB7JXTTNhZsE
ZZuS+4zJdlhjvsTO6k6yDccd5SpIa4+/u1TfEOcwactJ8fOpkQx81IpucZNNA+lqE8
1WdSkP0scP38fXQSD+T5s9Pksmg5fnDdKrSP198/jTHJg3p9AQ2H3uF+foOqlwntd4
62DhPawivk73A==
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 4SpMMF21S8z4wdC;
Mon, 11 Dec 2023 11:00:24 +1100 (AEDT)
Date: Mon, 11 Dec 2023 11:00:22 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Chan <michael.chan@broadcom.com>,
Randy Schacher <stuart.schacher@broadcom.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20231211110022.27926ad9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/k9n=Atmk6W3UJwIqYeIs6e5";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: <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 (lipwig.vger.email [0.0.0.0]);
Sun, 10 Dec 2023 16:00:33 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784941501414659178
X-GMAIL-MSGID: 1784941501414659178
|
| Series |
linux-next: manual merge of the net-next tree with the net tree
|
|
Commit Message
Stephen Rothwell
Dec. 11, 2023, midnight UTC
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
between commit:
c13e268c0768 ("bnxt_en: Fix HWTSTAMP_FILTER_ALL packet timestamp logic")
from the net tree and commits:
c2f8063309da ("bnxt_en: Refactor RX VLAN acceleration logic.")
a7445d69809f ("bnxt_en: Add support for new RX and TPA_START completion types for P7")
1c7fd6ee2fe4 ("bnxt_en: Rename some macros for the P5 chips")
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 drivers/net/ethernet/broadcom/bnxt/bnxt.c index 579eebb6fc56,92a54113f872..000000000000 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c