From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shuah Khan <skhan@linuxfoundation•org>,
Brendan Higgins <brendanhiggins@google•com>,
"David S. Miller" <davem@davemloft•net>
Cc: Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Oliver Hartkopp <socketcan@hartkopp•net>,
Ricardo Ribalda <ribalda@chromium•org>
Subject: linux-next: manual merge of the kunit-next tree with the net-next tree
Date: Thu, 7 Apr 2022 11:52:23 +1000 [thread overview]
Message-ID: <20220407115223.0b37dcea@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2022-04-07 1:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 1:52 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-17 8:36 linux-next: manual merge of the kunit-next tree with the net-next tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220407115223.0b37dcea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brendanhiggins@google$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ribalda@chromium$(echo .)org \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=socketcan@hartkopp$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox