From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D138C4332F for ; Tue, 13 Dec 2022 23:58:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237180AbiLMX6m (ORCPT ); Tue, 13 Dec 2022 18:58:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236598AbiLMX6l (ORCPT ); Tue, 13 Dec 2022 18:58:41 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4219622281; Tue, 13 Dec 2022 15:58:38 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NWwS84z60z4xMy; Wed, 14 Dec 2022 10:58:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1670975913; bh=bZ4RGyeJh2RXyjyUYY1LvU8RneVn5tnBRWeGuh+hOKI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=pZAj3xJh96hLjNNhYK1lrRyrmLhh2LzRyWCP8SOHLnNJ8Vgw8ECXX/zivIVIaR6ae 1xo2ZXiRjcVp+NN7PdDjq3lrQma6qxzgc13cs5NCulLw9hoYYwCYsKdPjVnl35lZxL lCy9jtdcbZ2FQE+37AOJ4yrGrCQ3Q1f4dKO2Bv7GDK3uHb9Oib4xIZ25cvOrHEwgGD nlvtQYAe05T7DTIDiRh5VIWZHfklkxJ34+geSCR51/kOoKiarWxwpMkc+I8EbJsjjm 1zw0824YK6/TzZedlnOIPyGmQ65g95Q3UexefcVswpTkhEvJAaL5+m6aEmRat5WblU 0O2UkH4JytwZw== Date: Wed, 14 Dec 2022 10:58:30 +1100 From: Stephen Rothwell To: John Johansen Cc: Shuah Khan , Brendan Higgins , Linux Kernel Mailing List , Linux Next Mailing List , Rae Moar 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 List-ID: X-Mailing-List: linux-next@vger.kernel.org --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 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--