| Message ID | 20201016084419.3c6e048a@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | linux-next: manual merge of the wireless-drivers tree with the net tree | expand |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > 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. Correct, I fast forwarded wireless-drivers from net-next to prepare for sending bug fixes in the end of the merge window. But I didn't realise that it might break linux-next build, so wireless-drivers should always follow net tree and not net-next. Sorry about that.
diff --cc tools/testing/selftests/net/Makefile index 3e7fb1e70c77,4773ce72edbd..000000000000 --- a/tools/testing/selftests/net/Makefile
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.