mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-27 15:57:09 +00:00
kernel: update some configs based on kernel 6.5 and 6.6
There are lots of configs removed from latest kernel. Update them here for convenience of next kernel upgrade. Remove CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE [1] Remove CONFIG_IP_NF_TARGET_CLUSTERIP [2] Remove CONFIG_NET_SCH_CBQ [3] Remove CONFIG_AUTOFS4_FS [4] Remove CONFIG_EMBEDDED [5] [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.6&id=a7e4676e8e2cb158a4d24123de778087955e1b36 [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.6&id=9db5d918e2c07fa09fab18bc7addf3408da0c76f [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.6&id=051d442098421c28c7951625652f61b1e15c4bd5 [4] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.6&id=1f2190d6b7112d22d3f8dfeca16a2f6a2f51444e [5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.6&id=ef815d2cba782e96b9aad9483523d474ed41c62a Fixes: #8408 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
This commit is contained in:
parent
cf4835e3ae
commit
379e2f3da2
@ -4,13 +4,6 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
|
|||||||
CONFIG_SMP=y
|
CONFIG_SMP=y
|
||||||
# Note, no nested VM support enabled here
|
# Note, no nested VM support enabled here
|
||||||
|
|
||||||
# Turn off embedded mode, as it disabled 'too much', and we
|
|
||||||
# no longer pass all the tests. We should refine this, and
|
|
||||||
# work out which of the ~66 items it enables are really needed.
|
|
||||||
# I believe this is the actual syntax we need for a fragment to
|
|
||||||
# disable an item...
|
|
||||||
# CONFIG_EMBEDDED is not set
|
|
||||||
|
|
||||||
# Note, no virt enabled baloon yet
|
# Note, no virt enabled baloon yet
|
||||||
CONFIG_INPUT=y
|
CONFIG_INPUT=y
|
||||||
CONFIG_PRINTK=y
|
CONFIG_PRINTK=y
|
||||||
|
@ -31,7 +31,6 @@ CONFIG_FSNOTIFY=y
|
|||||||
CONFIG_DNOTIFY=y
|
CONFIG_DNOTIFY=y
|
||||||
CONFIG_INOTIFY_USER=y
|
CONFIG_INOTIFY_USER=y
|
||||||
CONFIG_FANOTIFY=y
|
CONFIG_FANOTIFY=y
|
||||||
CONFIG_AUTOFS4_FS=y
|
|
||||||
CONFIG_AUTOFS_FS=y
|
CONFIG_AUTOFS_FS=y
|
||||||
CONFIG_TMPFS=y
|
CONFIG_TMPFS=y
|
||||||
CONFIG_DEVTMPFS=y
|
CONFIG_DEVTMPFS=y
|
||||||
|
@ -7,6 +7,5 @@ CONFIG_SECURITY_NETWORK=y
|
|||||||
CONFIG_SECURITY_SELINUX=y
|
CONFIG_SECURITY_SELINUX=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
CONFIG_SECURITY_SELINUX_DEVELOP=y
|
CONFIG_SECURITY_SELINUX_DEVELOP=y
|
||||||
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
|
|
||||||
CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
|
CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
|
||||||
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
|
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
|
||||||
|
@ -190,7 +190,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
|
|||||||
CONFIG_IP_NF_TARGET_NETMAP=y
|
CONFIG_IP_NF_TARGET_NETMAP=y
|
||||||
CONFIG_IP_NF_TARGET_REDIRECT=y
|
CONFIG_IP_NF_TARGET_REDIRECT=y
|
||||||
CONFIG_IP_NF_MANGLE=y
|
CONFIG_IP_NF_MANGLE=y
|
||||||
CONFIG_IP_NF_TARGET_CLUSTERIP=y
|
|
||||||
CONFIG_IP_NF_TARGET_ECN=y
|
CONFIG_IP_NF_TARGET_ECN=y
|
||||||
CONFIG_IP_NF_TARGET_TTL=y
|
CONFIG_IP_NF_TARGET_TTL=y
|
||||||
CONFIG_IP_NF_RAW=y
|
CONFIG_IP_NF_RAW=y
|
||||||
|
@ -42,7 +42,6 @@ CONFIG_BRIDGE=y
|
|||||||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||||
CONFIG_LLC=y
|
CONFIG_LLC=y
|
||||||
CONFIG_NET_SCHED=y
|
CONFIG_NET_SCHED=y
|
||||||
CONFIG_NET_SCH_CBQ=y
|
|
||||||
CONFIG_NET_SCH_MULTIQ=y
|
CONFIG_NET_SCH_MULTIQ=y
|
||||||
CONFIG_NET_SCH_FQ_CODEL=y
|
CONFIG_NET_SCH_FQ_CODEL=y
|
||||||
CONFIG_NET_SCH_FQ=y
|
CONFIG_NET_SCH_FQ=y
|
||||||
|
@ -2,10 +2,13 @@
|
|||||||
# without generating an error in fragment merging
|
# without generating an error in fragment merging
|
||||||
CONFIG_ARCH_RANDOM
|
CONFIG_ARCH_RANDOM
|
||||||
CONFIG_ARM64_CRYPTO
|
CONFIG_ARM64_CRYPTO
|
||||||
|
CONFIG_AUTOFS4_FS
|
||||||
CONFIG_GENERIC_MSI_IRQ_DOMAIN
|
CONFIG_GENERIC_MSI_IRQ_DOMAIN
|
||||||
|
CONFIG_IP_NF_TARGET_CLUSTERIP
|
||||||
CONFIG_PCI_MSI_IRQ_DOMAIN
|
CONFIG_PCI_MSI_IRQ_DOMAIN
|
||||||
CONFIG_CLK_LGM_CGU
|
CONFIG_CLK_LGM_CGU
|
||||||
CONFIG_MEMCG_SWAP
|
CONFIG_MEMCG_SWAP
|
||||||
|
CONFIG_NET_SCH_CBQ
|
||||||
CONFIG_NF_NAT_IPV4
|
CONFIG_NF_NAT_IPV4
|
||||||
CONFIG_NF_NAT_NEEDED
|
CONFIG_NF_NAT_NEEDED
|
||||||
CONFIG_NF_NAT_PROTO_DCCP
|
CONFIG_NF_NAT_PROTO_DCCP
|
||||||
@ -20,6 +23,7 @@ CONFIG_NF_LOG_COMMON
|
|||||||
CONFIG_MANDATORY_FILE_LOCKING
|
CONFIG_MANDATORY_FILE_LOCKING
|
||||||
CONFIG_ARM64_UAO
|
CONFIG_ARM64_UAO
|
||||||
CONFIG_VFIO_MDEV_DEVICE
|
CONFIG_VFIO_MDEV_DEVICE
|
||||||
|
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE
|
||||||
CONFIG_SPECULATION_MITIGATIONS
|
CONFIG_SPECULATION_MITIGATIONS
|
||||||
CONFIG_X86_SGX
|
CONFIG_X86_SGX
|
||||||
CONFIG_VIRTIO_IOMMU
|
CONFIG_VIRTIO_IOMMU
|
||||||
|
Loading…
Reference in New Issue
Block a user