Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 20 Dec 2023 11:51:18 +1100

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.

-- 
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 += test_bridge_neigh_suppres
  TEST_PROGS += test_vxlan_nolocalbypass.sh
  TEST_PROGS += test_bridge_backup_port.sh
  TEST_PROGS += fdb_flush.sh
 +TEST_PROGS += vlan_hw_filter.sh
+ TEST_PROGS += fq_band_pktlimit.sh
  
  TEST_FILES := settings