Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Tue, 5 Apr 2022 12:55:40 +1000
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
Message-ID: <20220405125540.2135d81d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/AgTO6kKYKuIZnbyIQZOZ85u";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/AgTO6kKYKuIZnbyIQZOZ85u
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 requ=
ired")

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.

--=20
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
 =20
  	size =3D unpack_u16_chunk(puf->e, &chunk);
 =20
 -	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);
  }
 =20
@@@ -430,8 -430,8 +430,8 @@@ static void policy_unpack_test_unpack_u
 =20
  	size =3D unpack_u16_chunk(puf->e, &chunk);
 =20
 -	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);
  }
 =20

--Sig_/AgTO6kKYKuIZnbyIQZOZ85u
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJLr6wACgkQAVBC80lX
0GyJnQf/QkeaZtW6owO89lZU4MNDWmuXCnwMNQFUq8zn++DBkraGLIhsvjSx6Qda
sjXtf+yJbZ8ymitnZ15KQl9EbfBZ2e/TR3ZDZdOGVbxbaTGJIJhhIpY0hK4QRhec
4OczTgg0E069PznOGPbM7UXtGSOVipnbJpWfMY1sT4Udr7qsiNrrRAyh9LaIKDIS
Kipvr1eTZkawdB3IibTtOzRWdgVHGVl5zKex9J3sfJeXn0nGsFAGJVQzxp1ILBFQ
lnLVenv8s3z5f5d+T9NxF7jtuM584Nz6Vm4bX7AseXOubigwmaEYGyfgu5fscp6z
FkwdjacK9CtlSfsMGrT1FSG3wI0hpQ==
=9CTE
-----END PGP SIGNATURE-----

--Sig_/AgTO6kKYKuIZnbyIQZOZ85u--