linux-kernel - Re: linux-next: manual merge of the arm64 tree with the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <ZxoB_Zu_KNTuO7sE@arm.com>
Date: Thu, 24 Oct 2024 09:14:53 +0100
From: Catalin Marinas <catalin.marinas@....com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Will Deacon <will@...nel.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	"Mike Rapoport (Microsoft)" <rppt@...nel.org>,
	Steven Price <steven.price@....com>,
	Suzuki K Poulose <suzuki.poulose@....com>
Subject: Re: linux-next: manual merge of the arm64 tree with the mm tree

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