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, 21 Jul 2022 09:45:12 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>
Cc:     Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Peter Collingbourne <pcc@google.com>
Subject: linux-next: manual merge of the arm64 tree with the arm64-fixes
 tree
Message-ID: <20220721094512.5419f75f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KBXJMu5JXdPIEqwsVqetM.i";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

Today's linux-next merge of the arm64 tree got a conflict in:

  arch/arm64/kernel/head.S

between commit:

  f7b4c3b82e7d ("arm64: set UXN on swapper page tables")

from the arm64-fixes tree and commits:

  e42ade29e3bc ("arm64: head: split off idmap creation code")
  c3cee924bd85 ("arm64: head: cover entire kernel image in initial ID map")

from the arm64 tree.

I didn't know if the change from the former was still needed after the
changes in the latter, so I left it out for now.

I fixed it up (see above) 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

--Sig_/KBXJMu5JXdPIEqwsVqetM.i
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLYk4gACgkQAVBC80lX
0GwHowgAk/oYLn9GA3lAdx7Hm6kgOvo7F5ToYMQ+1f+Ghb7sPDyot4XSCRpSxBnL
gwL202IlYzVmm0I1lHkoqyGq7GymTP0jZQTnTY4OvnSjqHL9SLLUZfM+/B6Hq71e
LiT7yaLE4QTS+ZejBnLh71V+/PdEfPxQIXZJAD1pRhi/GELHxFyxPCWXvqHcDxwM
jIxSongxEzE6GsvH+6lAz8tSTLzdu3hGDO3JY/KChANmwqQ+8e7OPKWsduTwvu0z
WoIZkCSuQjnxuA1ldmcpAtX0lUJWlBV6b0xOruUtOVFlYKsSemyaSLsed2GzP1YT
YRB02JBCOWtYrhuk9NCfM+17lSSmpQ==
=RaKZ
-----END PGP SIGNATURE-----

--Sig_/KBXJMu5JXdPIEqwsVqetM.i--