up to 5.17.6

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index a68a1c35509354d41f928388006ab486f8b9a906..7a497ca9cecef084c69d43f2489508cafbd13069 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -649,6 +649,7 @@ BCMA_DEBUG all=n
 BLK_DEV all=y
 #- file drivers/block/null_blk/Kconfig goes here
 BLK_DEV_FD all=m sparc=y
+BLK_DEV_FD_RAWCMD all=n
 MAC_FLOPPY ppc=m
 PARIDE all=m
 #- file drivers/block/paride/Kconfig goes here
@@ -6467,8 +6468,8 @@ ETHERNET arm=y arm64=y
 #- file drivers/net/ethernet/arc/Kconfig goes here
 #- file drivers/net/ethernet/asix/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
@@ -6476,7 +6477,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
@@ -6493,7 +6493,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
@@ -6502,14 +6501,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
@@ -6519,6 +6519,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
@@ -6526,10 +6527,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

diff --git a/kernel-x86.config b/kernel-x86.config
index 0a7146fb76224fbbaa6df8d1a64dfb5af04965ad..77b0708d9c032ec87d9b7bcf84dbed1be3fe4f62 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -7,6 +7,7 @@ SMP x86=y
 X86_X2APIC all=y
 X86_MPPARSE x86=y
 RETPOLINE x86=y
+SLS x86_64=y
 X86_CPU_RESCTRL all=y
 X86_BIGSMP i386=y
 X86_EXTENDED_PLATFORM i386=y x86_64=y

diff --git a/kernel.spec b/kernel.spec
index ef20dcb464bbd7585352897b18c8912ca77a3aa2..19de03eac350114ba58e59a8f8f4a0f26742e6ee 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define                rel             1
 %define                basever         5.17
-%define                postver         .5
+%define                postver         .6
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -121,7 +121,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 07321a70a48d062cebd0358132f11771
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  cdcffeee90d436b93ecb621d3ce940d8
+# Patch0-md5:  7ce7d9536f1b70b8190f2675cd03ee5b
 %endif
 Source1:       kernel.sysconfig