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, 5 Oct 2022 11:22:06 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Catalin Marinas <catalin.marinas@arm.com>
Cc:     broonie@kernel.org, Kees Cook <keescook@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Sami Tolvanen <samitolvanen@google.com>
Subject: Re: linux-next: manual merge of the kspp tree with the arm64 tree
Message-ID: <20221005112206.09278b2f@canb.auug.org.au>
In-Reply-To: <20220927185911.512737-1-broonie@kernel.org>
References: <20220927185911.512737-1-broonie@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/jGMgEiQh_H21JiOUzJUoqXD";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Tue, 27 Sep 2022 19:59:11 +0100 broonie@kernel.org wrote:
>=20
> Today's linux-next merge of the kspp tree got a conflict in:
>=20
>   arch/arm64/kernel/alternative.c
>=20
> between commit:
>=20
>   b723edf3a12a2 ("arm64: alternatives: make alt_region const")
>=20
> from the arm64 tree and commit:
>=20
>   5f20997c194e8 ("arm64: Drop unneeded __nocfi attributes")
>=20
> from the kspp 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
> diff --cc arch/arm64/kernel/alternative.c
> index 64045e3ef03a9,d2c66507398d7..0000000000000
> --- a/arch/arm64/kernel/alternative.c
> +++ b/arch/arm64/kernel/alternative.c
> @@@ -139,9 -133,8 +139,9 @@@ static void clean_dcache_range_nopatch(
>   	} while (cur +=3D d_size, cur < end);
>   }
>  =20
> - static void __nocfi __apply_alternatives(const struct alt_region *regio=
n,
> - 					 bool is_module,
> - 					 unsigned long *feature_mask)
>  -static void __apply_alternatives(struct alt_region *region, bool is_mod=
ule,
> ++static void __apply_alternatives(const struct alt_region *region,
> ++				 bool is_module,
> + 				 unsigned long *feature_mask)
>   {
>   	struct alt_instr *alt;
>   	__le32 *origptr, *updptr;

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

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM8zi4ACgkQAVBC80lX
0GzsiQgAnpGvw88K5JmTGXQUv/1YBcKCO43RdhTTDqYBfGFN9c+NZiynnUMczE4A
08PWx3/layXa0Xa/1d6GZnehKdhDNnjg8Zykk13Bh+V2qP1uvm1Xj/G8DLzrVQaE
q3W9R4d206DyADPaqwzaeY5rOkJ+oVn4q6DuWYpV3b5QiKlSPSeO7PhNpqZVYDIx
l1TXNp9+XHlp0/TiRVFP4uJndoWalrYeN26z+oQCYspuCzUTc+f+J6P+d4sgJNiM
1XELn9R205bN9k/PXOD5z2deiVFljWGu2NrQDSaXeLG/Rnap+1jWeH0BryESIFfW
R4ObP6pXmI9/ZkRjtM/Har0yk9E8xQ==
=jqr6
-----END PGP SIGNATURE-----

--Sig_/jGMgEiQh_H21JiOUzJUoqXD--