linux-next: build failure after merge of the tip tree

Stephen Rothwell
2025-05-14T05:23:22Z

[-- Attachment #1: Type: text/plain, Size: 1471 bytes --]

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@canb.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@canb.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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]