Today's linux-next merge of the net-next tree got conflicts in:

  tools/testing/selftests/drivers/net/gro.c
  tools/testing/selftests/drivers/net/hw/toeplitz.c

between commit:

  7edd42093cb0 ("selftests: complete kselftest include centralization")

from the mm-nonmm-unstable tree and commits:

  89268f7dbca1 ("selftests: net: relocate gro and toeplitz tests to drivers/net")
  fdb0267d565a ("selftests: drv-net: add a Python version of the GRO test")
  9cf9aa77a1f6 ("selftests: drv-net: hw: convert the Toeplitz test to Python")

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.


diff --cc tools/testing/selftests/drivers/net/gro.c
index 76aa75469a8c,995b492f5bcb..000000000000

--- a/tools/testing/selftests/drivers/net/gro.c
+++ b/tools/testing/selftests/drivers/net/gro.c

@@@ -57,7 -57,8 +57,8 @@@
  #include <string.h>
  #include <unistd.h>
  
 -#include "../../kselftest.h"
 +#include "kselftest.h"
+ #include "../../net/lib/ksft.h"
  
  #define DPORT 8000
  #define SPORT 1500
diff --cc tools/testing/selftests/drivers/net/hw/toeplitz.c
index 4b58152d5a49,afc5f910b006..000000000000

--- a/tools/testing/selftests/drivers/net/hw/toeplitz.c
+++ b/tools/testing/selftests/drivers/net/hw/toeplitz.c

@@@ -52,7 -52,8 +52,8 @@@
  #include <sys/types.h>
  #include <unistd.h>
  
 -#include "../../../kselftest.h"
 +#include "kselftest.h"
+ #include "../../../net/lib/ksft.h"
  
  #define TOEPLITZ_KEY_MIN_LEN	40
  #define TOEPLITZ_KEY_MAX_LEN	60