Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Date:   Thu, 14 Dec 2023 11:30:41 +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:     Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,
        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>,
        Pavan Chebbi <pavan.chebbi@broadcom.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20231214113041.3a0c003c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/hEnblnRG.vC/RW3TIeCOmTM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/hEnblnRG.vC/RW3TIeCOmTM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c

between commit:

  bd6781c18cb5 ("bnxt_en: Fix wrong return value check in bnxt_close_nic()")

from the net tree and commit:

  84793a499578 ("bnxt_en: Skip nic close/open when configuring tstamp filte=
rs")

from the net-next tree.

I fixed it up (I just used the latter) 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/hEnblnRG.vC/RW3TIeCOmTM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV6TLEACgkQAVBC80lX
0Gyduwf/ZqPVHbvKCTdr9wvSTpKY/zAYHIZoyTVPexbE1O5RAqd4axotWLeiL/hB
0zFeE6zT8jdSENUZPr/Qyxb/XSLC3p+BHA8UZu3UC7wDaJcLqo5xPfEku2kuG/0g
gbVy5OEi9aM9c1r+jiC0rcumsK7NHg7/YPoIaF79yXujf8VvXd9aq+rA0at2mupi
ZsdLMMGm0ZHFEU/tPEdIQ63AFOvd2F+jNlKmN7OsIvFGYpEYL8KNgcKRadQWcWpE
dzfqq7Gpkplyu2HFrrtfM72O+Or2+7y5+StBvzG/KS7m9Ef3hgR7I7lmoF+W/4p5
MpDbn6EogDMmrHp6UUmQTJ72RWbxgQ==
=ymwH
-----END PGP SIGNATURE-----

--Sig_/hEnblnRG.vC/RW3TIeCOmTM--