linux-kernel - linux-next: build failure after merge of the tip 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-next>] [day] [month] [year] [list]

Message-ID: <20250514152318.52714b39@canb.auug.org.au>
Date: Wed, 14 May 2025 15:23:18 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo
 Abeni <pabeni@...hat.com>
Cc: Raju Rangoju <Raju.Rangoju@....com>, Networking
 <netdev@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the tip tree

Hi all,

After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from drivers/net/ethernet/amd/xgbe/xgbe-dev.c:18:
drivers/net/ethernet/amd/xgbe/xgbe-smn.h:15:10: fatal error: asm/amd_nb.h: No such file or directory
   15 | #include <asm/amd_nb.h>
      |          ^~~~~~~~~~~~~~

Caused by commit

  bcbb65559532 ("x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h>")

interacting with commit

  e49479f30ef9 ("amd-xgbe: add support for new XPCS routines")

from the net-next tree.

I have applied the following merge resolution for today.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 14 May 2025 14:49:31 +1000
Subject: [PATCH] fix up for "x86/platform/amd: Move the <asm/amd_nb.h> header
 to <asm/amd/nb.h>"

interacting with "amd-xgbe: add support for new XPCS routines" from the
net-next tree.

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/net/ethernet/amd/xgbe/xgbe-smn.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-smn.h b/drivers/net/ethernet/amd/xgbe/xgbe-smn.h
index 3fd03d39c18a..c6ae127ced03 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-smn.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-smn.h
@@ -12,7 +12,7 @@

 #ifdef CONFIG_AMD_NB

-#include <asm/amd_nb.h>
+#include <asm/amd/nb.h>

 #else

-- 
2.47.2

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped