diff --git a/config/kernel/linux-mvebu-next.config b/config/kernel/linux-mvebu-next.config index 6550aa3afe..57cee213b3 100644 --- a/config/kernel/linux-mvebu-next.config +++ b/config/kernel/linux-mvebu-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.66 Kernel Configuration +# Linux/arm 4.14.94 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -471,6 +471,8 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_SPECTRE=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_KUSER_HELPERS=y # CONFIG_VDSO is not set CONFIG_OUTER_CACHE=y @@ -4329,7 +4331,6 @@ CONFIG_CIFS_STATS=y # CONFIG_CIFS_WEAK_PW_HASH is not set CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DFS_UPCALL is not set diff --git a/config/kernel/linux-mvebu64-next.config b/config/kernel/linux-mvebu64-next.config index 8f055ae84a..9d80abde9a 100644 --- a/config/kernel/linux-mvebu64-next.config +++ b/config/kernel/linux-mvebu64-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.13 Kernel Configuration +# Linux/arm64 4.19.16 Kernel Configuration # # @@ -4293,9 +4293,9 @@ CONFIG_TYPEC_FUSB302=m # USB Type-C Alternate Mode drivers # # CONFIG_TYPEC_DP_ALTMODE is not set +CONFIG_USB_ROLE_SWITCH=m # CONFIG_USB_LED_TRIG is not set # CONFIG_USB_ULPI_BUS is not set -CONFIG_USB_ROLE_SWITCH=m # CONFIG_UWB is not set CONFIG_MMC=y CONFIG_PWRSEQ_EMMC=y @@ -4898,6 +4898,9 @@ CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y +# CONFIG_XFS_ONLINE_SCRUB is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set CONFIG_BTRFS_FS=y diff --git a/config/kernel/linux-pine64-default.config b/config/kernel/linux-pine64-default.config index d5e7556dcc..1742a908e3 100644 --- a/config/kernel/linux-pine64-default.config +++ b/config/kernel/linux-pine64-default.config @@ -124,11 +124,8 @@ CONFIG_CHECKPOINT_RESTORE=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y -CONFIG_UIDGID_CONVERTED=y -CONFIG_UIDGID_STRICT_TYPE_CHECKS=y # CONFIG_SCHED_AUTOGROUP is not set CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set @@ -3157,6 +3154,8 @@ CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set