Skip to content

Commit 9fa71af

Browse files
kelsey-steelechessturo
authored andcommitted
configs: 5.15.137 stable configs update
Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
1 parent e1ffc30 commit 9fa71af

2 files changed

Lines changed: 19 additions & 17 deletions

File tree

arch/arm64/configs/config-wsl-arm64

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 5.15.90.3 Kernel Configuration
3+
# Linux/arm64 5.15.137.1 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0"
5+
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 9.4.0-1ubuntu1~20.04.2) 9.4.0"
66
CONFIG_CC_IS_GCC=y
77
CONFIG_GCC_VERSION=90400
88
CONFIG_CLANG_VERSION=0
@@ -16,6 +16,7 @@ CONFIG_CC_CAN_LINK_STATIC=y
1616
CONFIG_CC_HAS_ASM_GOTO=y
1717
CONFIG_CC_HAS_ASM_INLINE=y
1818
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
19+
CONFIG_PAHOLE_VERSION=121
1920
CONFIG_IRQ_WORK=y
2021
CONFIG_BUILDTIME_TABLE_SORT=y
2122
CONFIG_THREAD_INFO_IN_TASK=y
@@ -353,6 +354,9 @@ CONFIG_ARM64_ERRATUM_1530923=y
353354
CONFIG_ARM64_ERRATUM_1508412=y
354355
# CONFIG_ARM64_ERRATUM_2441009 is not set
355356
# CONFIG_ARM64_ERRATUM_2457168 is not set
357+
CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
358+
CONFIG_ARM64_ERRATUM_2054223=y
359+
CONFIG_ARM64_ERRATUM_2067961=y
356360
# CONFIG_CAVIUM_ERRATUM_22375 is not set
357361
# CONFIG_CAVIUM_ERRATUM_23154 is not set
358362
# CONFIG_CAVIUM_ERRATUM_27456 is not set
@@ -1309,7 +1313,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
13091313
CONFIG_VLAN_8021Q=y
13101314
# CONFIG_VLAN_8021Q_GVRP is not set
13111315
# CONFIG_VLAN_8021Q_MVRP is not set
1312-
# CONFIG_DECNET is not set
13131316
CONFIG_LLC=y
13141317
# CONFIG_LLC2 is not set
13151318
# CONFIG_ATALK is not set
@@ -1363,14 +1366,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel"
13631366
#
13641367
CONFIG_NET_CLS=y
13651368
# CONFIG_NET_CLS_BASIC is not set
1366-
# CONFIG_NET_CLS_TCINDEX is not set
13671369
# CONFIG_NET_CLS_ROUTE4 is not set
13681370
# CONFIG_NET_CLS_FW is not set
13691371
CONFIG_NET_CLS_U32=y
13701372
CONFIG_CLS_U32_PERF=y
13711373
CONFIG_CLS_U32_MARK=y
1372-
# CONFIG_NET_CLS_RSVP is not set
1373-
# CONFIG_NET_CLS_RSVP6 is not set
13741374
# CONFIG_NET_CLS_FLOW is not set
13751375
CONFIG_NET_CLS_CGROUP=y
13761376
CONFIG_NET_CLS_BPF=y
@@ -1675,7 +1675,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
16751675
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
16761676
# CONFIG_BLK_DEV_DRBD is not set
16771677
# CONFIG_BLK_DEV_NBD is not set
1678-
# CONFIG_BLK_DEV_SX8 is not set
16791678
CONFIG_BLK_DEV_RAM=y
16801679
CONFIG_BLK_DEV_RAM_COUNT=16
16811680
CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -1801,6 +1800,7 @@ CONFIG_SCSI_LOWLEVEL=y
18011800
# CONFIG_SCSI_AIC94XX is not set
18021801
# CONFIG_SCSI_MVSAS is not set
18031802
# CONFIG_SCSI_MVUMI is not set
1803+
# CONFIG_SCSI_DPT_I2O is not set
18041804
# CONFIG_SCSI_ADVANSYS is not set
18051805
# CONFIG_SCSI_ARCMSR is not set
18061806
# CONFIG_SCSI_ESAS2R is not set
@@ -2581,7 +2581,7 @@ CONFIG_DRM_VGEM=y
25812581
# CONFIG_DRM_AST is not set
25822582
# CONFIG_DRM_MGAG200 is not set
25832583
# CONFIG_DRM_RCAR_DW_HDMI is not set
2584-
# CONFIG_DRM_RCAR_LVDS is not set
2584+
# CONFIG_DRM_RCAR_USE_LVDS is not set
25852585
# CONFIG_DRM_QXL is not set
25862586
# CONFIG_DRM_VIRTIO_GPU is not set
25872587
CONFIG_DRM_PANEL=y
@@ -2637,7 +2637,6 @@ CONFIG_DRM_PANEL_BRIDGE=y
26372637
# CONFIG_DRM_ETNAVIV is not set
26382638
# CONFIG_DRM_HISI_HIBMC is not set
26392639
# CONFIG_DRM_HISI_KIRIN is not set
2640-
# CONFIG_DRM_MXSFB is not set
26412640
# CONFIG_DRM_ARCPGU is not set
26422641
# CONFIG_DRM_BOCHS is not set
26432642
# CONFIG_DRM_CIRRUS_QEMU is not set
@@ -4054,6 +4053,7 @@ CONFIG_DEBUG_INFO=y
40544053
# CONFIG_DEBUG_INFO_SPLIT is not set
40554054
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
40564055
# CONFIG_DEBUG_INFO_DWARF4 is not set
4056+
# CONFIG_DEBUG_INFO_DWARF5 is not set
40574057
CONFIG_DEBUG_INFO_BTF=y
40584058
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
40594059
CONFIG_DEBUG_INFO_BTF_MODULES=y

arch/x86/configs/config-wsl

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 5.15.90.3 Kernel Configuration
3+
# Linux/x86 5.15.137.1 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.1.0-1ubuntu1~20.04) 11.1.0"
5+
CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.4.0-2ubuntu1~20.04) 11.4.0"
66
CONFIG_CC_IS_GCC=y
7-
CONFIG_GCC_VERSION=110100
7+
CONFIG_GCC_VERSION=110400
88
CONFIG_CLANG_VERSION=0
99
CONFIG_AS_IS_GNU=y
1010
CONFIG_AS_VERSION=23400
@@ -18,6 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1818
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1919
CONFIG_CC_HAS_ASM_INLINE=y
2020
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
21+
CONFIG_PAHOLE_VERSION=121
2122
CONFIG_IRQ_WORK=y
2223
CONFIG_BUILDTIME_TABLE_SORT=y
2324
CONFIG_THREAD_INFO_IN_TASK=y
@@ -461,6 +462,7 @@ CONFIG_MODIFY_LDT_SYSCALL=y
461462
CONFIG_HAVE_LIVEPATCH=y
462463
# end of Processor type and features
463464

465+
CONFIG_CC_HAS_SLS=y
464466
CONFIG_CC_HAS_RETURN_THUNK=y
465467
CONFIG_SPECULATION_MITIGATIONS=y
466468
CONFIG_PAGE_TABLE_ISOLATION=y
@@ -469,6 +471,9 @@ CONFIG_RETHUNK=y
469471
CONFIG_CPU_UNRET_ENTRY=y
470472
CONFIG_CPU_IBPB_ENTRY=y
471473
CONFIG_CPU_IBRS_ENTRY=y
474+
CONFIG_CPU_SRSO=y
475+
# CONFIG_SLS is not set
476+
# CONFIG_GDS_FORCE_MITIGATION is not set
472477
CONFIG_ARCH_HAS_ADD_PAGES=y
473478
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
474479

@@ -651,6 +656,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
651656
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
652657
CONFIG_ARCH_HAS_SET_MEMORY=y
653658
CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
659+
CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
654660
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
655661
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
656662
CONFIG_ARCH_WANTS_NO_INSTR=y
@@ -1344,7 +1350,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
13441350
CONFIG_VLAN_8021Q=y
13451351
# CONFIG_VLAN_8021Q_GVRP is not set
13461352
# CONFIG_VLAN_8021Q_MVRP is not set
1347-
# CONFIG_DECNET is not set
13481353
CONFIG_LLC=y
13491354
# CONFIG_LLC2 is not set
13501355
# CONFIG_ATALK is not set
@@ -1398,14 +1403,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel"
13981403
#
13991404
CONFIG_NET_CLS=y
14001405
# CONFIG_NET_CLS_BASIC is not set
1401-
# CONFIG_NET_CLS_TCINDEX is not set
14021406
# CONFIG_NET_CLS_ROUTE4 is not set
14031407
# CONFIG_NET_CLS_FW is not set
14041408
CONFIG_NET_CLS_U32=y
14051409
CONFIG_CLS_U32_PERF=y
14061410
CONFIG_CLS_U32_MARK=y
1407-
# CONFIG_NET_CLS_RSVP is not set
1408-
# CONFIG_NET_CLS_RSVP6 is not set
14091411
# CONFIG_NET_CLS_FLOW is not set
14101412
CONFIG_NET_CLS_CGROUP=y
14111413
CONFIG_NET_CLS_BPF=y
@@ -1684,7 +1686,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
16841686
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
16851687
# CONFIG_BLK_DEV_DRBD is not set
16861688
# CONFIG_BLK_DEV_NBD is not set
1687-
# CONFIG_BLK_DEV_SX8 is not set
16881689
CONFIG_BLK_DEV_RAM=y
16891690
CONFIG_BLK_DEV_RAM_COUNT=16
16901691
CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -3924,6 +3925,7 @@ CONFIG_DEBUG_INFO=y
39243925
# CONFIG_DEBUG_INFO_SPLIT is not set
39253926
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
39263927
# CONFIG_DEBUG_INFO_DWARF4 is not set
3928+
# CONFIG_DEBUG_INFO_DWARF5 is not set
39273929
CONFIG_DEBUG_INFO_BTF=y
39283930
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
39293931
CONFIG_DEBUG_INFO_BTF_MODULES=y

0 commit comments

Comments
 (0)