Skip to content

Commit

Permalink
Merge tag 'x86_build_for_v5.17_rc1-p2' of git://git.kernel.org/pub/sc…
Browse files Browse the repository at this point in the history
…m/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
  • Loading branch information
torvalds committed Jan 11, 2022
2 parents f12fc75 + b6aa86c commit f18e2d8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/x86/configs/i386_defconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_AUDIT=y
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion arch/x86/configs/x86_64_defconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_AUDIT=y
Expand Down Expand Up @@ -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

0 comments on commit f18e2d8

Please sign in to comment.