linux-kernel - Re: linux-next: build failure after merge of the kvm-arm 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: <aNOhsvMwLJ4n4_c9@willie-the-truck>
Date: Wed, 24 Sep 2025 08:45:54 +0100
From: Will Deacon <will@...nel.org>
To: Anshuman Khandual <anshuman.khandual@....com>
Cc: Mark Brown <broonie@...nel.org>,
	Christoffer Dall <cdall@...columbia.edu>,
	Marc Zyngier <maz@...nel.org>,
	Catalin Marinas <catalin.marinas@....com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the kvm-arm tree

On Wed, Sep 24, 2025 at 08:07:16AM +0530, Anshuman Khandual wrote:
> 
> 
> On 23/09/25 10:14 PM, Will Deacon wrote:
> > On Tue, Sep 23, 2025 at 05:02:02PM +0100, Will Deacon wrote:
> >> On Tue, Sep 23, 2025 at 05:28:05PM +0200, Mark Brown wrote:
> >>> After merging the kvm-arm tree, today's linux-next build (arm64
> >>> defconfig) failed like this:
> >>>
> >>> In file included from <command-line>:
> >>> /tmp/next/build/arch/arm64/kvm/at.c: In function 'setup_s1_walk':
> >>> /tmp/next/build/arch/arm64/kvm/at.c:229:30: error: 'TCR_SH1_MASK' undeclared (first use in this function); did you mean 'TCR_SH0_MASK'?
> >>>   229 |                    FIELD_GET(TCR_SH1_MASK, tcr) :
> >>>       |                              ^~~~~~~~~~~~
> >>
> >> [...]
> >>
> >>> Caused by commit
> >>>
> >>>    4f91624778b27 ("arm64/sysreg: Replace TCR_EL1 field macros")
> >>>
> >>> from the arm64 tree.  I have reverted that commit.
> >>
> >> Thanks, I'll drop it from arm64 as well.
> > 
> > (now dropped)
> 
> Hello Will/Mark,
> 
> The conflict happened as the commit c0cc438046ee (“KVM: arm64: Compute shareability for LPA2”)
> which came in via the KVM tree, added a new TCR_SH1_MASK instance. Shall I respin the patches
> accommodating the new changes from KVM or just wait for the next merge window ?

Probably best to wait at this stage. I don't think anybody is depending
on the cleanup for anything but please correct me if I'm wrong.

Will