Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 14 Dec 2022 10:58:30 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     John Johansen <john.johansen@canonical.com>
Cc:     Shuah Khan <skhan@linuxfoundation.org>,
        Brendan Higgins <brendanhiggins@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Rae Moar <rmoar@google.com>
Subject: Re: linux-next: manual merge of the kunit-next tree with the
 apparmor tree
Message-ID: <20221214105830.3bde0179@canb.auug.org.au>
In-Reply-To: <20221208124653.71ba9491@canb.auug.org.au>
References: <20221208124653.71ba9491@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+O0ZxHU/rk0+ec2g2d+N/6m";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/+O0ZxHU/rk0+ec2g2d+N/6m
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 8 Dec 2022 12:46:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the kunit-next tree got a conflict in:
>=20
>   security/apparmor/policy_unpack_test.c
>=20
> between commits:
>=20
>   371e50a0b19f ("apparmor: make unpack_array return a trianary value")
>   32490541682b ("apparmor: Fix kunit test for out of bounds array")
>=20
> from the apparmor tree and commit:
>=20
>   2c92044683f5 ("apparmor: test: make static symbols visible during kunit=
 testing")
>=20
> from the kunit-next tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc security/apparmor/policy_unpack_test.c
> index 7465da42492d,f25cf2a023d5..000000000000
> --- a/security/apparmor/policy_unpack_test.c
> +++ b/security/apparmor/policy_unpack_test.c
> @@@ -144,8 -147,8 +147,8 @@@ static void policy_unpack_test_unpack_a
>  =20
>   	puf->e->pos +=3D TEST_ARRAY_BUF_OFFSET;
>  =20
> - 	KUNIT_EXPECT_EQ(test, unpack_array(puf->e, NULL, &array_size),
>  -	array_size =3D aa_unpack_array(puf->e, NULL);
>  -
> ++	KUNIT_EXPECT_EQ(test, aa_unpack_array(puf->e, NULL, &array_size),
>  +			TRI_TRUE);
>   	KUNIT_EXPECT_EQ(test, array_size, (u16)TEST_ARRAY_SIZE);
>   	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,
>   		puf->e->start + TEST_ARRAY_BUF_OFFSET + sizeof(u16) + 1);
> @@@ -159,8 -162,8 +162,8 @@@ static void policy_unpack_test_unpack_a
>  =20
>   	puf->e->pos +=3D TEST_NAMED_ARRAY_BUF_OFFSET;
>  =20
> - 	KUNIT_EXPECT_EQ(test, unpack_array(puf->e, name, &array_size),
>  -	array_size =3D aa_unpack_array(puf->e, name);
>  -
> ++	KUNIT_EXPECT_EQ(test, aa_unpack_array(puf->e, name, &array_size),
>  +			TRI_TRUE);
>   	KUNIT_EXPECT_EQ(test, array_size, (u16)TEST_ARRAY_SIZE);
>   	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,
>   		puf->e->start + TEST_ARRAY_BUF_OFFSET + sizeof(u16) + 1);
> @@@ -175,8 -178,9 +178,8 @@@ static void policy_unpack_test_unpack_a
>   	puf->e->pos +=3D TEST_NAMED_ARRAY_BUF_OFFSET;
>   	puf->e->end =3D puf->e->start + TEST_ARRAY_BUF_OFFSET + sizeof(u16);
>  =20
> - 	KUNIT_EXPECT_EQ(test, unpack_array(puf->e, name, &array_size),
>  -	array_size =3D aa_unpack_array(puf->e, name);
>  -
>  -	KUNIT_EXPECT_EQ(test, array_size, 0);
> ++	KUNIT_EXPECT_EQ(test, aa_unpack_array(puf->e, name, &array_size),
>  +			TRI_FALSE);
>   	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,
>   		puf->e->start + TEST_NAMED_ARRAY_BUF_OFFSET);
>   }

This is now a conflict between the apparmor tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/+O0ZxHU/rk0+ec2g2d+N/6m
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmOZEaYACgkQAVBC80lX
0Gx/ewf/cLWHgqmcA4c51sliHeP5JvxIYLWcLY2ZlKhvYnfQykGyxueyI3/gc7k8
Ez/9TGq+/R86jodzaGTCQYrXEWe7IpmkV7UuCDCAQVne8O6XWUNG+o6dJaop9Teu
E+XYT+C9mXgI17wV2YJAHdqcAq7fG6979e6wvFDAYLpl8ZA6e0+WUpr5LcCp3FFr
vEpba2ulXSaxGsawUnIDghDEAWCT3zK0F71PzRpks2B7OaoF0r5yod2QI9I8zdHt
9/Ucm0yMRdu8zIACz54z/omVsN9IuMJDsW92MqnD4P6eDHtQRB/Mj+tInoJXQpqD
7QEEcL3ImePrpJVbNNSo8x693NGAXA==
=/nMs
-----END PGP SIGNATURE-----

--Sig_/+O0ZxHU/rk0+ec2g2d+N/6m--