Skip to content

Commit b5aebbb

Browse files
cristibirsancristibirsan
committed
Merge branch 'linux-6.1-trunk/at91/config' into linux-6.1-mchp
2 parents fe531be + ec4b125 commit b5aebbb

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

‎arch/arm/configs/at91_dt_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
CONFIG_SYSVIPC=y
33
CONFIG_NO_HZ_IDLE=y
44
CONFIG_HIGH_RES_TIMERS=y
5+
CONFIG_IKCONFIG=y
6+
CONFIG_IKCONFIG_PROC=y
57
CONFIG_LOG_BUF_SHIFT=16
68
CONFIG_CGROUPS=y
79
CONFIG_CGROUP_CPUACCT=y

‎arch/arm/configs/sama5_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ CONFIG_SYSVIPC=y
33
CONFIG_POSIX_MQUEUE=y
44
CONFIG_NO_HZ_IDLE=y
55
CONFIG_HIGH_RES_TIMERS=y
6+
CONFIG_IKCONFIG=y
7+
CONFIG_IKCONFIG_PROC=y
68
CONFIG_LOG_BUF_SHIFT=16
79
CONFIG_CGROUPS=y
810
CONFIG_MEMCG=y

‎arch/arm/configs/sama7_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
CONFIG_SYSVIPC=y
33
CONFIG_NO_HZ_IDLE=y
44
CONFIG_HIGH_RES_TIMERS=y
5+
CONFIG_IKCONFIG=y
6+
CONFIG_IKCONFIG_PROC=y
57
CONFIG_LOG_BUF_SHIFT=16
68
CONFIG_CGROUPS=y
79
CONFIG_CGROUP_DEBUG=y

0 commit comments

Comments
 (0)