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;
Date:   Wed, 21 Sep 2022 11:04:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Benjamin Poirier <bpoirier@nvidia.com>,
        Hangbin Liu <liuhangbin@gmail.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20220921110437.5b7dbd82@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fMzlTe=dfgNibQEXH1RoZP1";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/fMzlTe=dfgNibQEXH1RoZP1
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:

  tools/testing/selftests/drivers/net/bonding/Makefile

between commit:

  bbb774d921e2 ("net: Add tests for bonding and team address list managemen=
t")

from the net tree and commit:

  152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/drivers/net/bonding/Makefile
index 0f9659407969,d209f7a98b6c..000000000000
--- a/tools/testing/selftests/drivers/net/bonding/Makefile
+++ b/tools/testing/selftests/drivers/net/bonding/Makefile
@@@ -1,9 -1,7 +1,10 @@@
  # SPDX-License-Identifier: GPL-2.0
  # Makefile for net selftests
 =20
 -TEST_PROGS :=3D bond-break-lacpdu-tx.sh
 +TEST_PROGS :=3D bond-break-lacpdu-tx.sh \
 +	      dev_addr_lists.sh
+ TEST_PROGS +=3D bond-lladdr-target.sh
 =20
 +TEST_FILES :=3D lag_lib.sh
 +
  include ../../../lib.mk

--Sig_/fMzlTe=dfgNibQEXH1RoZP1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMqYyUACgkQAVBC80lX
0GzWcwf/Uo+MDRXuWaswDOzApoLW53AoWpLbvZA5CZHYyyAeDTkYBrhn6oSCUrep
zvFDyCm72RPsCqYh0eplUtbZ5wUg3H3OmhSrR2FphdL886jjhpSQCWcjHDRJUC38
40nKUkGK+Ho+e7b+Ai1peHE6h8ngFiJbUXF0ei1/br+lrJ7Ixc4LqEn6qWPKKnJ6
yly/mDszX1EwdosSnxf+k6XrIpSbBQnGpwlpheHqmMcu6HMZIvfK9JaSHfad8zI9
b15pgVJI6YPWJzvFJ+vrg7zP9608K4qCZSlHE3ICDWgdTzDIc+UNM8QoQc/0jUB7
fCLhxsKO6IAbvRTMScsQJOlsI2ZDtg==
=LLRc
-----END PGP SIGNATURE-----

--Sig_/fMzlTe=dfgNibQEXH1RoZP1--