Up to 5.15.57 (and disable WARN_ALL_UNSEEDED_RANDOM as on master)

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index f22a37594a55dd07f98fdd1d8dcecc596d5fa62f..08dfd5c44fdda5368eb0c331d703a6cadd9a87de 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -9,6 +9,9 @@ ARM_KPROBES_TEST arm=m
 ARM_PTDUMP_DEBUGFS arm=n
 COMPAT_32BIT_TIME all=y
 CPA_DEBUG all=n
+CPU_IBPB_ENTRY all=y
+CPU_IBRS_ENTRY all=y
+CPU_UNRET_ENTRY all=y
 DEBUG_ALIGN_RODATA arm64=n
 DEBUG_BOOT_PARAMS all=y
 DEBUG_EFI arm64=n
@@ -39,6 +42,7 @@ KPROBES arm=y arm64=y
 LOCK_EVENT_COUNTS all=n
 LTO_NONE all=y
 MICROCODE_OLD_INTERFACE all=n
+PAGE_TABLE_ISOLATION all=y
 PERF_EVENTS_AMD_POWER all=m
 PERF_EVENTS_AMD_UNCORE all=m
 PERF_EVENTS_INTEL_CSTATE all=m
@@ -50,9 +54,11 @@ RANDOMIZE_KSTACK_OFFSET_DEFAULT all=y
 RANDOMIZE_MEMORY all=y
 RAS_CEC all=y
 RAS_CEC_DEBUG all=n
+RETHUNK all=y
 SCHED_MC_PRIO all=y
 SECCOMP all=y
 SECCOMP_CACHE_DEBUG all=n
+SPECULATION_MITIGATIONS all=y
 STACKPROTECTOR all=y
 STACKPROTECTOR_STRONG all=y
 STATIC_CALL_SELFTEST all=n
@@ -299,7 +305,6 @@ CRYPTO_USER_API_RNG_CAVP all=n
 CRYPTO_USER_API_AEAD all=m
 CRYPTO_USER_API_ENABLE_OBSOLETE all=y
 CRYPTO_STATS all=y
-#- file lib/crypto/Kconfig goes here
 #- file drivers/crypto/Kconfig goes here
 #- file crypto/asymmetric_keys/Kconfig goes here
 #- file certs/Kconfig goes here
@@ -6386,8 +6391,8 @@ ETHERNET arm=y arm64=y
 #- file drivers/net/ethernet/aquantia/Kconfig goes here
 #- file drivers/net/ethernet/arc/Kconfig goes here
 #- file drivers/net/ethernet/atheros/Kconfig goes here
+CX_ECAT all=m
 #- file drivers/net/ethernet/broadcom/Kconfig goes here
-#- file drivers/net/ethernet/brocade/Kconfig goes here
 #- file drivers/net/ethernet/cadence/Kconfig goes here
 #- file drivers/net/ethernet/calxeda/Kconfig goes here
 #- file drivers/net/ethernet/cavium/Kconfig goes here
@@ -6395,7 +6400,6 @@ ETHERNET arm=y arm64=y
 #- file drivers/net/ethernet/cirrus/Kconfig goes here
 #- file drivers/net/ethernet/cisco/Kconfig goes here
 #- file drivers/net/ethernet/cortina/Kconfig goes here
-CX_ECAT all=m
 #- file drivers/net/ethernet/davicom/Kconfig goes here
 DNET all=m
 #- file drivers/net/ethernet/dec/Kconfig goes here
@@ -6411,7 +6415,6 @@ DNET all=m
 #- file drivers/net/ethernet/i825xx/Kconfig goes here
 #- file drivers/net/ethernet/ibm/Kconfig goes here
 #- file drivers/net/ethernet/intel/Kconfig goes here
-#- file drivers/net/ethernet/microsoft/Kconfig goes here
 #- file drivers/net/ethernet/xscale/Kconfig goes here
 JME all=m
 #- file drivers/net/ethernet/litex/Kconfig goes here
@@ -6420,14 +6423,15 @@ JME all=m
 #- file drivers/net/ethernet/mellanox/Kconfig goes here
 #- file drivers/net/ethernet/micrel/Kconfig goes here
 #- file drivers/net/ethernet/microchip/Kconfig goes here
-#- file drivers/net/ethernet/moxa/Kconfig goes here
 #- file drivers/net/ethernet/mscc/Kconfig goes here
+#- file drivers/net/ethernet/microsoft/Kconfig goes here
+#- file drivers/net/ethernet/moxa/Kconfig goes here
 #- file drivers/net/ethernet/myricom/Kconfig goes here
 FEALNX all=m
+#- file drivers/net/ethernet/ni/Kconfig goes here
 #- file drivers/net/ethernet/natsemi/Kconfig goes here
 #- file drivers/net/ethernet/neterion/Kconfig goes here
 #- file drivers/net/ethernet/netronome/Kconfig goes here
-#- file drivers/net/ethernet/ni/Kconfig goes here
 #- file drivers/net/ethernet/8390/Kconfig goes here
 #- file drivers/net/ethernet/nvidia/Kconfig goes here
 #- file drivers/net/ethernet/nxp/Kconfig goes here
@@ -6437,6 +6441,7 @@ ETHOC all=m
 #- file drivers/net/ethernet/pasemi/Kconfig goes here
 #- file drivers/net/ethernet/pensando/Kconfig goes here
 #- file drivers/net/ethernet/qlogic/Kconfig goes here
+#- file drivers/net/ethernet/brocade/Kconfig goes here
 #- file drivers/net/ethernet/qualcomm/Kconfig goes here
 #- file drivers/net/ethernet/rdc/Kconfig goes here
 #- file drivers/net/ethernet/realtek/Kconfig goes here
@@ -6444,10 +6449,10 @@ ETHOC all=m
 #- file drivers/net/ethernet/rocker/Kconfig goes here
 #- file drivers/net/ethernet/samsung/Kconfig goes here
 #- file drivers/net/ethernet/seeq/Kconfig goes here
-#- file drivers/net/ethernet/sfc/Kconfig goes here
 #- file drivers/net/ethernet/sgi/Kconfig goes here
 #- file drivers/net/ethernet/silan/Kconfig goes here
 #- file drivers/net/ethernet/sis/Kconfig goes here
+#- file drivers/net/ethernet/sfc/Kconfig goes here
 #- file drivers/net/ethernet/smsc/Kconfig goes here
 #- file drivers/net/ethernet/socionext/Kconfig goes here
 #- file drivers/net/ethernet/stmicro/Kconfig goes here
@@ -8741,7 +8746,6 @@ DELL_WMI_SYSMAN all=m
 #-
 #- *** FILE: drivers/platform/x86/intel/Kconfig ***
 #-
-X86_PLATFORM_DRIVERS_INTEL=y
 #- file drivers/platform/x86/intel/atomisp2/Kconfig goes here
 #- file drivers/platform/x86/intel/int1092/Kconfig goes here
 #- file drivers/platform/x86/intel/int33fe/Kconfig goes here
@@ -10973,6 +10977,7 @@ TYPEC_RT1711H all=m
 TYPEC_MT6360 all=m
 TYPEC_TCPCI_MAXIM all=m
 TYPEC_FUSB302 all=m
+TYPEC_WCOVE all=m
 
 #-
 #- *** FILE: drivers/usb/typec/tipd/Kconfig ***
@@ -11123,9 +11128,9 @@ DUMMY_CONSOLE all=y
 DUMMY_CONSOLE_COLUMNS all=80
 DUMMY_CONSOLE_ROWS all=25
 FRAMEBUFFER_CONSOLE all=y
+FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION all=y
 FRAMEBUFFER_CONSOLE_ROTATION all=y
 FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER all=y
-FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION all=y
 
 #-
 #- *** FILE: drivers/video/fbdev/Kconfig ***
@@ -12575,6 +12580,7 @@ PACKING arm=y arm64=y
 BITREVERSE all=y
 #- file lib/math/Kconfig goes here
 INDIRECT_PIO arm64=n
+#- file lib/crypto/Kconfig goes here
 CRC_CCITT all=y
 CRC16 all=m
 CRC_T10DIF all=y
@@ -12712,7 +12718,7 @@ SCF_TORTURE_TEST all=m
 CSD_LOCK_WAIT_DEBUG all=n
 DEBUG_IRQFLAGS all=n
 STACKTRACE arm=y arm64=y
-WARN_ALL_UNSEEDED_RANDOM all=y
+WARN_ALL_UNSEEDED_RANDOM all=n
 DEBUG_KOBJECT all=n
 DEBUG_KOBJECT_RELEASE all=n
 DEBUG_LIST all=n
@@ -12808,9 +12814,9 @@ KCSAN all=n
 #- *** FILE: lib/Kconfig.kfence ***
 #-
 KFENCE all=y
-KFENCE_STATIC_KEYS all=y
 KFENCE_SAMPLE_INTERVAL all=100
 KFENCE_NUM_OBJECTS all=255
+KFENCE_STATIC_KEYS all=y
 
 #-
 #- *** FILE: lib/Kconfig.kgdb ***
@@ -12834,8 +12840,6 @@ UBSAN all=n
 #-
 #- *** FILE: lib/crypto/Kconfig ***
 #-
-#- Crypto library routines
-CRYPTO_LIB_BLAKE2S all=m
 CRYPTO_LIB_CHACHA all=m
 CRYPTO_LIB_CURVE25519 all=m
 CRYPTO_LIB_POLY1305 all=m
@@ -14067,7 +14071,6 @@ GCC_PLUGIN_RANDSTRUCT_PERFORMANCE all=y
 SECURITY_DMESG_RESTRICT all=y
 SECURITY all=y
 SECURITY_NETWORK all=y
-PAGE_TABLE_ISOLATION all=y
 SECURITY_INFINIBAND all=y
 SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
@@ -14602,9 +14605,6 @@ SND_SOC_MIKROE_PROTO arm=m arm64=m
 #-
 SND_BCM2835_SOC_I2S arm=m
 SND_BCM63XX_I2S_WHISTLER all=m
-SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
-SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
-SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
 
 #-
 #- *** FILE: sound/soc/codecs/Kconfig ***
@@ -15142,6 +15142,7 @@ BLK_DEV_VIA82CXXX all=m
 CACHEFILES_HISTOGRAM all=n
 CAIF_HSI all=m
 CIFS_WEAK_PW_HASH all=y
+CRYPTO_LIB_BLAKE2S all=m
 CYCLADES all=m
 CYZ_INTR all=n
 DEBUG_BLOCK_EXT_DEVT all=n
@@ -15190,6 +15191,9 @@ ROCKETPORT all=m
 SBNI i386=m x86_64=m
 SBNI_MULTILINE i386=y x86_64=y
 SENSORS_AMD_ENERGY all=m
+SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
+SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
+SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
 SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 all=y
 SND_SOC_ZX_AUD96P22 all=m
 STAGING_APEX_DRIVER all=m
@@ -15203,4 +15207,5 @@ WIMAX_DEBUG_LEVEL all=8
 WIMAX_I2400M_DEBUG_LEVEL all=8
 WIMAX_I2400M_USB all=m
 WWAN_CORE all=m
+X86_PLATFORM_DRIVERS_INTEL=y
 X86_SYSFB all=y

diff --git a/kernel.spec b/kernel.spec
index fc0d4f5ac426a0bcc62852fd55bbd6dfda8539d3..8f035359c058a015b75f65efb9724ff9923bc6b4 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define                rel             1
 %define                basever         5.15
-%define                postver         .48
+%define                postver         .57
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -121,7 +121,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  b2bcc150cd1589502caf6a7b7b739fff
+# Patch0-md5:  85b403115c80612870c5b32694bc3769
 %endif
 Source1:       kernel.sysconfig