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:   Thu, 8 Dec 2022 12:46:53 +1100
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:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Rae Moar <rmoar@google.com>
Subject: linux-next: manual merge of the kunit-next tree with the apparmor
 tree
Message-ID: <20221208124653.71ba9491@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Q+BBA6cEB4yIN0ghvRN3GVl";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Q+BBA6cEB4yIN0ghvRN3GVl
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 commits:

  371e50a0b19f ("apparmor: make unpack_array return a trianary value")
  32490541682b ("apparmor: Fix kunit test for out of bounds array")

from the apparmor tree and commit:

  2c92044683f5 ("apparmor: test: make static symbols visible during kunit t=
esting")

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 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);
  }

--Sig_/Q+BBA6cEB4yIN0ghvRN3GVl
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmORQg0ACgkQAVBC80lX
0GzV5gf+JTwzJNKW1cEuJuCkTEF5EPMN1qLpObPKX4OORf6uX8LcICq9mTae/DVy
ijV+ef8vgI8pn2O40cZWaNDUOjXc1BUxVOeBO8/Qp8KR4svA8H194lwMbVPQcUvN
/b/YbNoAuakj+VwFXY8RQGjAYIDBFP2Ke5LL+dRVEZAATdjReAWA8y19r2h0oYAV
RL5mDy7unZ61QOuW+wMLQy3/N11i/GwnfYlL05yjLNhYR7csOMZPFhJiAN431dYF
zSMxXeGQ54g0nkSU9AuUVHIfztnh58hM1ZC704R2r+wEjy1nwYGa/T8IXxpj3mjL
QIKdIG55mSFw/nA4fHQy4bHMaDgD7Q==
=O70J
-----END PGP SIGNATURE-----

--Sig_/Q+BBA6cEB4yIN0ghvRN3GVl--