On Thu, Oct 24, 2024 at 10:37:09AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm64 tree got a conflict in: > > arch/arm64/mm/pageattr.c > > between commit: > > 040ee4186d6c ("arch: introduce set_direct_map_valid_noflush()") > > from the mm-unstable branch of the mm tree and commit: > > 42be24a4178f ("arm64: Enable memory encrypt for Realms") > > from the arm64 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. The resolution looks fine. Thanks Stephen. -- Catalin