From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shuah Khan <skhan@linuxfoundation.org>,
Brendan Higgins <brendanhiggins@google.com>,
John Johansen <john.johansen@canonical.com>
Cc: David Gow <davidgow@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Ricardo Ribalda <ribalda@chromium.org>
Subject: linux-next: manual merge of the kunit-next tree with the apparmor tree
Date: Tue, 5 Apr 2022 12:55:40 +1000 [thread overview]
Message-ID: <20220405125540.2135d81d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]
Hi all,
Today's linux-next merge of the kunit-next tree got a conflict in:
security/apparmor/policy_unpack_test.c
between commit:
d86d1652ab13 ("apparmor: test: Remove some casts which are no-longer required")
from the apparmor tree and commit:
5f91bd9f1e7a ("apparmor: 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 security/apparmor/policy_unpack_test.c
index 399dce3781aa,5c18d2f19862..000000000000
--- a/security/apparmor/policy_unpack_test.c
+++ b/security/apparmor/policy_unpack_test.c
@@@ -408,8 -408,8 +408,8 @@@ static void policy_unpack_test_unpack_u
size = unpack_u16_chunk(puf->e, &chunk);
- KUNIT_EXPECT_EQ(test, size, (size_t)0);
+ KUNIT_EXPECT_EQ(test, size, 0);
- KUNIT_EXPECT_PTR_EQ(test, chunk, NULL);
+ KUNIT_EXPECT_NULL(test, chunk);
KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, puf->e->end - 1);
}
@@@ -430,8 -430,8 +430,8 @@@ static void policy_unpack_test_unpack_u
size = unpack_u16_chunk(puf->e, &chunk);
- KUNIT_EXPECT_EQ(test, size, (size_t)0);
+ KUNIT_EXPECT_EQ(test, size, 0);
- KUNIT_EXPECT_PTR_EQ(test, chunk, NULL);
+ KUNIT_EXPECT_NULL(test, chunk);
KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, puf->e->start + TEST_U16_OFFSET);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-04-05 3:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-05 2:55 Stephen Rothwell [this message]
2022-07-04 23:13 ` linux-next: manual merge of the kunit-next tree with the apparmor tree Stephen Rothwell
2022-07-05 8:57 ` David Gow
2022-07-05 18:22 ` John Johansen
2022-12-08 1:46 Stephen Rothwell
2022-12-13 23:58 ` Stephen Rothwell
2022-12-14 18:38 ` John Johansen
2022-12-08 2:53 Stephen Rothwell
2022-12-08 20:10 ` John Johansen
2022-12-12 17:52 ` Shuah Khan
2022-12-12 18:03 ` Shuah Khan
2022-12-12 19:20 ` John Johansen
2022-12-12 19:48 ` Shuah Khan
2022-12-12 19:53 ` John Johansen
2022-12-12 23:19 ` Shuah Khan
2022-12-12 23:56 ` David Gow
2022-12-13 3:22 ` Stephen Rothwell
2022-12-14 0:00 ` Stephen Rothwell
2022-12-14 0:55 ` John Johansen
2022-12-14 18:38 ` John Johansen
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=20220405125540.2135d81d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=john.johansen@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ribalda@chromium.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.