Commit dafc2d0f authored May 15, 2024 by Petr Mladek

Merge branch 'for-6.10-base-small' into for-linus

parents e0550222 27021649

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