Received-SPF: pass (google.com: domain of linux-kernel+bounces-6210-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 20 Dec 2023 11:51:18 +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>, Liu Jian <liujian56@huawei.com>, Willem de
 Bruijn <willemb@google.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20231220115118.218147ff@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/F0QZ/zY980=Ou7ZKrHIgYyu";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/F0QZ/zY980=Ou7ZKrHIgYyu
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/net/Makefile

between commit:

  2258b666482d ("selftests: add vlan hw filter tests")

from the net tree and commit:

  a0bc96c0cd6e ("selftests: net: verify fq per-band packet limit")

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/net/Makefile
index 9e5bf59a20bf,14bd68da7466..000000000000
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -91,7 -91,7 +91,8 @@@ TEST_PROGS +=3D test_bridge_neigh_suppres
  TEST_PROGS +=3D test_vxlan_nolocalbypass.sh
  TEST_PROGS +=3D test_bridge_backup_port.sh
  TEST_PROGS +=3D fdb_flush.sh
 +TEST_PROGS +=3D vlan_hw_filter.sh
+ TEST_PROGS +=3D fq_band_pktlimit.sh
 =20
  TEST_FILES :=3D settings
 =20

--Sig_/F0QZ/zY980=Ou7ZKrHIgYyu
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWCOoYACgkQAVBC80lX
0GyWQAf9H6JruRjUS9893bY3LpYu9kD/kjQbBrMz6gjnCN/BXSjZnwU1dyTEmITk
iqibH3mHuSB5zdfjTmt7dMtlNuECAbJAYEtf9EyiwX1Zieo4EAk2/81xqP1DG5Wo
oUe3Z/HsJ/9SE+h8cjXJ3R1dND2kq3zc+oPYtAdRuJKiFDQFW06w8XIgmLxS1ve5
ktVVsOdscxjq5PT1qBYIGtxmAk90ZL0rGCv0/abGK0u1rziKpqsEiLDrN6a3zT9o
y1DP5mdpXWTXIsLFubi1De+vvX+6eS+XwGiZCdcP45OIs9gmtRqvJCpwVbWjWFZE
nmcevg6piOHgXQWWIzOTdz5mzhVxkw==
=LSWa
-----END PGP SIGNATURE-----

--Sig_/F0QZ/zY980=Ou7ZKrHIgYyu--