linux-kernel - Re: linux-next: build failure after merge of the drivers-x86 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: <aCXkofMlUGxEmzMN@gmail.com>
Date: Thu, 15 May 2025 14:57:05 +0200
From: Ingo Molnar <mingo@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
	PDx86 ML <platform-driver-x86@...r.kernel.org>,
	Suma Hegde <suma.hegde@....com>,
	Hans de Goede <hdegoede@...hat.com>,
	Mark Gross <markgross@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	x86@...nel.org, Thomas Gleixner <tglx@...utronix.de>,
	Borislav Petkov <bp@...en8.de>,
	Dave Hansen <dave.hansen@...ux.intel.com>
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree


* Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi Ingo,
> 
> On Thu, 15 May 2025 11:22:50 +0200 Ingo Molnar <mingo@...nel.org> wrote:
> >
> > I'm not sure that's needed, the above build failure is not really a 
> > build failure caused by the platform-drivers-x86.git tree, it is a 
> > semantic merge conflict that should be resolved at the linux-next level 
> > I think. (And which conflict should be mentioned to Linus by whoever 
> > sends their tree second.)
> > 
> > Stephen, could you apply the patch below perhaps?
> 
> Thanks for the fix.  Applied from tomorrow.

Thank you Stephen!!

	Ingo