linux-next: manual merge of the kunit-next tree with the net-next tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1263 bytes --]

Hi all,

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

  net/mctp/test/route-test.c

between commit:

  f4b41f062c42 ("net: remove noblock parameter from skb_recv_datagram()")

from the net-next tree and commit:

  741c9286ffad ("mctp: test: Use NULL macros")

from the kunit-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 net/mctp/test/route-test.c
index 24df29e135ed,17d9c49000c5..000000000000
--- a/net/mctp/test/route-test.c
+++ b/net/mctp/test/route-test.c
@@@ -360,8 -360,8 +360,8 @@@ static void mctp_test_route_input_sk(st
  
  	} else {
  		KUNIT_EXPECT_NE(test, rc, 0);
 -		skb2 = skb_recv_datagram(sock->sk, 0, 1, &rc);
 +		skb2 = skb_recv_datagram(sock->sk, MSG_DONTWAIT, &rc);
- 		KUNIT_EXPECT_PTR_EQ(test, skb2, NULL);
+ 		KUNIT_EXPECT_NULL(test, skb2);
  	}
  
  	__mctp_route_test_fini(test, dev, rt, sock);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]