summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-01-11 15:38:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2022-01-11 15:38:11 -0800
commitf18e2d877269672597088c308ca75d7d52620028 (patch)
tree092ac6ffe09ea6198078512eba6dcbb256dcfab7
parentf12fc75ef7db44d71d5a509e2f1bec6966b73776 (diff)
parentb6aa86cff44cf099299d3a5e66348cb709cd7964 (diff)
downloadlinux-f18e2d877269672597088c308ca75d7d52620028.tar.bz2
Merge tag 'x86_build_for_v5.17_rc1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull missed x86 build updates from Borislav Petkov: "In the heat of the battle between me and the tip pull requests, I've sent you the tip:x86/build branch without the two top-most commits from Ingo (it appears I hadn't fast-forwarded my local branch, sorry about that). Therefore, here's a part 2 of x86/build for 5.17. - Make x86 defconfigs more useful by enabling CONFIG_LOCALVERSION_AUTO and CONFIG_KALLSYMS_ALL And while you merge that, I'll be at the blackboard, writing: I will always fast-forward local branches before tagging and sending pull requests to Linus. I will always fast-forward local branches before tagging and sending pull requests to Linus. I will always fast-forward local branches before tagging and sending pull requests..." * tag 'x86_build_for_v5.17_rc1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/kbuild: Enable CONFIG_KALLSYMS_ALL=y in the defconfigs x86/defconfig: Enable CONFIG_LOCALVERSION_AUTO=y in the defconfig
-rw-r--r--arch/x86/configs/i386_defconfig2
-rw-r--r--arch/x86/configs/x86_64_defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index e81885384f60..71124cf8630c 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -1,4 +1,3 @@
-# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_AUDIT=y
@@ -262,3 +261,4 @@ CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
CONFIG_EARLY_PRINTK_DBGP=y
CONFIG_DEBUG_BOOT_PARAMS=y
+CONFIG_KALLSYMS_ALL=y
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index e8a7a0af2bda..92b1169ec90b 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -1,4 +1,3 @@
-# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_AUDIT=y
@@ -258,3 +257,4 @@ CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
CONFIG_EARLY_PRINTK_DBGP=y
CONFIG_DEBUG_BOOT_PARAMS=y
+CONFIG_KALLSYMS_ALL=y