Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/net/.gitignore
between commit:
252e01e68241 ("selftests: net: add netlink-dumps to .gitignore")
from the net tree and commit:
be43a6b23829 ("selftests: ncdevmem: Move ncdevmem under drivers/net/hw")
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/.gitignore
index 59fe07ee2df9,48973e78d46b..000000000000
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@@ -18,8 -19,6 +19,7 @@@ ipv6_flowlabel_mg
log.txt
msg_oob
msg_zerocopy
- ncdevmem
+netlink-dumps
nettest
psock_fanout
psock_snd
Attachment:
pgpTqVlQ_HQTg.pgp
Description: OpenPGP digital signature
