From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kalle Valo <kvalo@codeaurora•org>,
Wireless <linux-wireless@vger•kernel.org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>
Cc: Ido Schimmel <idosch@mellanox•com>,
Jakub Kicinski <kuba@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Michael Jeanson <mjeanson@efficios•com>
Subject: linux-next: manual merge of the wireless-drivers tree with the net tree
Date: Fri, 16 Oct 2020 08:44:19 +1100 [thread overview]
Message-ID: <20201016084419.3c6e048a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1385 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-10-15 21:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 21:44 Stephen Rothwell [this message]
2020-10-16 6:01 ` linux-next: manual merge of the wireless-drivers tree with the net tree Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201016084419.3c6e048a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=idosch@mellanox$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=mjeanson@efficios$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox