netdev - linux-next: manual merge of the wireless-drivers tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20201016084419.3c6e048a@canb.auug.org.au>
Date:   Fri, 16 Oct 2020 08:44:19 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kalle Valo <kvalo@...eaurora.org>,
        Wireless <linux-wireless@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Ido Schimmel <idosch@...lanox.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Jeanson <mjeanson@...icios.com>
Subject: linux-next: manual merge of the wireless-drivers tree with the net
 tree

Hi all,

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

  tools/testing/selftests/net/Makefile

between commit:

  1a01727676a8 ("selftests: Add VRF route leaking tests")

from the net tree and commit:

  b7cc6d3c5c91 ("selftests: net: Add drop monitor test")

from the wireless-drivers (presumably because it has merged part of the
net-next tree) 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 3e7fb1e70c77,4773ce72edbd..000000000000
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -19,7 -19,7 +19,8 @@@ TEST_PROGS += txtimestamp.s
  TEST_PROGS += vrf-xfrm-tests.sh
  TEST_PROGS += rxtimestamp.sh
  TEST_PROGS += devlink_port_split.py
+ TEST_PROGS += drop_monitor_tests.sh
 +TEST_PROGS += vrf_route_leaking.sh
  TEST_PROGS_EXTENDED := in_netns.sh
  TEST_GEN_FILES =  socket nettest
  TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any

Content of type "application/pgp-signature" skipped