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

Stephen Rothwell 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

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