X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.9%2Farmhf;h=b1628a2b2f7f5d9beea0f20459f271120e5d5812;hb=a469ce0330ed950cf7ccb4e8485810d0b4f92a63;hp=824c0e1b925f226240b787d183069b5ad1049f1c;hpb=b8f2cdd34626d6dceb1a18ddb48062e689f83487;p=kernel-configs.git

diff --git a/4.9/armhf b/4.9/armhf
index 824c0e1..b1628a2 100644
--- a/4.9/armhf
+++ b/4.9/armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.305-gnu1 Kernel Configuration
+# Linux/arm 4.9.312-gnu1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -642,6 +642,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_SPECTRE=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
@@ -1937,6 +1938,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -2876,7 +2878,6 @@ CONFIG_MLXSW_SPECTRUM_DCB=y
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
 CONFIG_KSZ884X_PCI=m
 CONFIG_NET_VENDOR_MICROCHIP=y
 CONFIG_ENC28J60=m