| Message ID | 20231206110306.01e91114@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 r17csp3782690vqy;
Tue, 5 Dec 2023 16:03:48 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IGpSe0gsgC8wXHhTjepBURmR+YEqvl04cY0LYopybMk+LzjtI47wnjq+QUNFwgCuL37K2H6
X-Received: by 2002:a17:902:d648:b0:1d0:6ffe:1ea0 with SMTP id
y8-20020a170902d64800b001d06ffe1ea0mr15741plh.131.1701821028174;
Tue, 05 Dec 2023 16:03:48 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1701821028; cv=none;
d=google.com; s=arc-20160816;
b=XA8Gzzo6878SDEUEFiosL2QTBxDjDLksRg3iORelLrrAA+cQmyq7Yi36OMbYFvYBFW
BugAfiRQnDW3Q6YCmYda3SjUaolQoM4m9tgM2r+/CsScR+gETJ40tVJW9qddeGE7KCWq
7HjkgQ+8N9w8jlSDP3m5JlcvdlNyo656Xz764N4YqGRLNM6lgFXf2G+Txau3ph/GF/ti
0lDigjgyKf3Ikyzr/1v0vGFUrw4t3I8CrTfF8lEDEo+5fnIkQSVC7Gv9hTDxJWLVO7cW
nN9xhOg8on/m/nfQMDLEpCsy6MRCL/2q1l5VANd1SOJcLjIybqOIW6kXuYiIxov1/Rck
DWcg==
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=ronpnnEzcd7JvKQZCY6xrXsmrmM+QLQMggAqInw3QwU=;
fh=r8tc1bkCzCJyYmJpQQ4UXWbg2rtGJBqoG+gKbUDtqes=;
b=GPTzj8QqGCR6tzKsyDZVSQAwPtw7lKNbO5BqTJ/ve0A1cr90neW6088OtzUk2BuTlc
KwLvTSgWj4kJ4ALd5RId6LvOBn5xM0Xyg0S6CZobHQ4Nb5E9zkJa0s0pGsqbdQhBAdFZ
NNtyKuOTgBKC3s5uIZVY5dGQ52EyhWXAVSe8OT/D+0aW/nhd1n+Ry8xW7evL5NdHjnVq
UTG8JsgP1LozfvBewvU5jXoY9S2C0KlIpXk0DvTD3UbK/BfsPLm3PnjRWbH0R0kcWIRe
Ckz6fyD6JCYOEaLqPMZciKMLPl9h9nBSnLnO5VDxgxmgvYIiXKejONQIe92dhWFo4vMB
klmQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DvEZEIpV;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 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. [23.128.96.37])
by mx.google.com with ESMTPS id
d9-20020a170902728900b001d0be32b0d0si2563771pll.352.2023.12.05.16.03.36
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 05 Dec 2023 16:03:48 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DvEZEIpV;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 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 ECE87802FD18;
Tue, 5 Dec 2023 16:03:34 -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 S1346621AbjLFADL (ORCPT <rfc822;chrisfriedt@gmail.com>
+ 99 others); Tue, 5 Dec 2023 19:03:11 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43964 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229591AbjLFADI (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 5 Dec 2023 19:03:08 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A216118F;
Tue, 5 Dec 2023 16:03:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1701820989;
bh=ronpnnEzcd7JvKQZCY6xrXsmrmM+QLQMggAqInw3QwU=;
h=Date:From:To:Cc:Subject:From;
b=DvEZEIpV5IyNkQFg473L7biH43IG3v6k6WQNTupyg73eUlS9bYxF8hdUGY15f2ovN
fu4A/T/HpGbAdCI9oIf1C295YC89+d90A4i8SHB6lU6woDTmDLodBDgWgQuyogS4Yv
cDuFLJOylfS34sQygw23Tc3r+vS2Rba8CFYA+7i/P3XRZSDmMraF03gTuQvMM9XSLI
gNRFLNggtkT7k9dXc9MlDR5cbBzt0w4VzyobKiKY3UlARdXn4GR50IHEgsAw/7s2iR
OR1RGael1IsJhrrtUo+D1Id7ZejsPQFQHQPB2zmfewNM8FaAuSUPpZCFAOc9GKLs8C
23ZLMCD9CPITg==
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 4SlHfh2WzFz4wc6;
Wed, 6 Dec 2023 11:03:07 +1100 (AEDT)
Date: Wed, 6 Dec 2023 11:03:06 +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: Jianheng Zhang <Jianheng.Zhang@synopsys.com>,
Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rohan G Thomas <rohan.g.thomas@intel.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20231206110306.01e91114@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Ywn_.bCg_=VIfBrJ+KiY.nh";
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]);
Tue, 05 Dec 2023 16:03:35 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784488686297572811
X-GMAIL-MSGID: 1784488686297572811
|
| Series |
linux-next: manual merge of the net-next tree with the net tree
|
|
Commit Message
Stephen Rothwell
Dec. 6, 2023, 12:03 a.m. UTC
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
drivers/net/ethernet/stmicro/stmmac/dwmac5.c
drivers/net/ethernet/stmicro/stmmac/dwmac5.h
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
drivers/net/ethernet/stmicro/stmmac/hwif.h
between commit:
37e4b8df27bc ("net: stmmac: fix FPE events losing")
from the net tree and commit:
c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
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/stmicro/stmmac/dwmac5.c index 8fd167501fa0,ea92650f5c97..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac5.h index 34e620790eb3,8b0f2c90faef..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h diff --cc drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index a74e71db79f9,f33f73de5cfe..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c diff --cc drivers/net/ethernet/stmicro/stmmac/hwif.h index 68aa2d5ca6e5,72412d733856..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h