This is a note to let you know that I've just added the patch titled net: of: fix stub of_net helpers for CONFIG_NET=n to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-of-fix-stub-of_net-helpers-for-config_net-n.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 3258d71f32585ed5ed73a758ee30a7e2792225ae Author: Arnd Bergmann <arnd@xxxxxxxx> Date: Thu Oct 14 11:00:37 2021 +0200 net: of: fix stub of_net helpers for CONFIG_NET=n [ Upstream commit 8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8 ] Moving the of_net code from drivers/of/ to net/core means we no longer stub out the helpers when networking is disabled, which leads to a randconfig build failure with at least one ARM platform that calls this from non-networking code: arm-linux-gnueabi-ld: arch/arm/mach-mvebu/kirkwood.o: in function `kirkwood_dt_eth_fixup': kirkwood.c:(.init.text+0x54): undefined reference to `of_get_mac_address' Restore the way this worked before by changing that #ifdef check back to testing for both CONFIG_OF and CONFIG_NET. Fixes: e330fb14590c ("of: net: move of_net under net/") Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Link: https://lore.kernel.org/r/20211014090055.2058949-1-arnd@xxxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> diff --git a/include/linux/of_net.h b/include/linux/of_net.h index cf31188329b5a..55460ecfa50ad 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -8,7 +8,7 @@ #include <linux/phy.h> -#ifdef CONFIG_OF +#if defined(CONFIG_OF) && defined(CONFIG_NET) #include <linux/of.h> struct net_device;