Commit a19264d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'printk-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux 

Pull printk updates from Petr Mladek:

 - Use no_printk() instead of "if (0) printk()" constructs to avoid
   generating printk index for messages disabled at compile time

 - Remove deprecated strncpy/strcpy from printk.c

 - Remove redundant CONFIG_BASE_FULL in favor of CONFIG_BASE_SMALL

* tag 'printk-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: cleanup deprecated uses of strncpy/strcpy
  printk: Remove redundant CONFIG_BASE_FULL
  printk: Change type of CONFIG_BASE_SMALL to bool
  printk: Fix LOG_CPU_MAX_BUF_SHIFT when BASE_SMALL is enabled
  ceph: Use no_printk() helper
  dyndbg: Use *no_printk() helpers
  dev_printk: Add and use dev_no_printk()
  printk: Let no_printk() use _printk()
parents 1ab1bd2f dafc2d0f

arch/arm/configs/collie_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

# CONFIG_BASE_FULL is not set

CONFIG_BASE_SMALL=y

# CONFIG_EPOLL is not set

CONFIG_ARCH_MULTI_V4=y

# CONFIG_ARCH_MULTI_V7 is not set

arch/arm/configs/keystone_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ CONFIG_CGROUP_DEVICE=y 
CONFIG_CGROUP_CPUACCT=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_ELF_CORE is not set

# CONFIG_BASE_FULL is not set

CONFIG_BASE_SMALL=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EXPERT=y

CONFIG_PROFILING=y

arch/arm/configs/lpc18xx_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_RD_LZ4 is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_UID16 is not set

# CONFIG_BASE_FULL is not set

CONFIG_BASE_SMALL=y

# CONFIG_FUTEX is not set

# CONFIG_EPOLL is not set

# CONFIG_SIGNALFD is not set

arch/arm/configs/moxart_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_EXPERT=y

# CONFIG_ELF_CORE is not set

# CONFIG_BASE_FULL is not set

CONFIG_BASE_SMALL=y

# CONFIG_SIGNALFD is not set

# CONFIG_TIMERFD is not set

# CONFIG_EVENTFD is not set

arch/arm/configs/mps2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ CONFIG_LOG_BUF_SHIFT=16 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_EXPERT=y

# CONFIG_UID16 is not set

# CONFIG_BASE_FULL is not set

CONFIG_BASE_SMALL=y

# CONFIG_FUTEX is not set

# CONFIG_EPOLL is not set

# CONFIG_SIGNALFD is not set