Hi all,

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

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

between commit:

  f48b6111ba40 ("selftests: complete kselftest include centralization")

from the mm-nonmm-unstable tree and commit:

  aa91dbf3eda2 ("selftests: hw-net: toeplitz: read the RSS key directly from C")

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/drivers/net/hw/toeplitz.c
index 4b58152d5a49,a4d04438c313..000000000000
--- a/tools/testing/selftests/drivers/net/hw/toeplitz.c
+++ b/tools/testing/selftests/drivers/net/hw/toeplitz.c
@@@ -52,7 -52,11 +52,11 @@@
  #include <sys/types.h>
  #include <unistd.h>
  
+ #include <ynl.h>
+ #include "ethtool-user.h"
+ 
 -#include "../../../kselftest.h"
 +#include "kselftest.h"
+ #include "../../../net/lib/ksft.h"
  
  #define TOEPLITZ_KEY_MIN_LEN	40
  #define TOEPLITZ_KEY_MAX_LEN	60