Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

16 files changed, 28 insertions, 28 deletions

diff --git a/configs/fedora/generic/CONFIG_SSB b/configs/fedora/generic/CONFIG_SSB
index 3313a71ad..4a239c413 100644
--- a/configs/fedora/generic/CONFIG_SSB
+++ b/configs/fedora/generic/CONFIG_SSB
@@ -1 +1 @@
-CONFIG_SSB=y
+CONFIG_SSB=m
diff --git a/configs/fedora/generic/CONFIG_XDP_SOCKETS b/configs/fedora/generic/CONFIG_XDP_SOCKETS
index 27e0e2026..061b65a41 100644
--- a/configs/fedora/generic/CONFIG_XDP_SOCKETS
+++ b/configs/fedora/generic/CONFIG_XDP_SOCKETS
@@ -1 +1 @@
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8dc4af80e..cfce2f7c2 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5992,11 +5992,11 @@ CONFIG_SRAM=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
@@ -7093,7 +7093,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index e40eda739..8b91cfe3a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5968,11 +5968,11 @@ CONFIG_SRAM=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
@@ -7069,7 +7069,7 @@ CONFIG_WM8350_WATCHDOG=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index a9582e003..7fc64c906 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6409,11 +6409,11 @@ CONFIG_SRAM=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
@@ -7596,7 +7596,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4a454ab5e..a29c7a237 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6019,11 +6019,11 @@ CONFIG_SRAM=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
@@ -7144,7 +7144,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index fac967b68..d2014df7d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5995,11 +5995,11 @@ CONFIG_SRAM=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
@@ -7120,7 +7120,7 @@ CONFIG_WM8350_WATCHDOG=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 8cf089b45..090967f85 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6385,11 +6385,11 @@ CONFIG_SRAM=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
@@ -7572,7 +7572,7 @@ CONFIG_WM8350_WATCHDOG=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 7d5299aed..0921b026b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5669,11 +5669,11 @@ CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STA2X11 is not set
 CONFIG_STACKPROTECTOR_STRONG=y
@@ -6731,7 +6731,7 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 # CONFIG_X86_SYSFB is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_BALLOON=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 24bbdc449..50ac97086 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5644,11 +5644,11 @@ CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STA2X11 is not set
 CONFIG_STACKPROTECTOR_STRONG=y
@@ -6706,7 +6706,7 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 # CONFIG_X86_SYSFB is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_BALLOON=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 15be470f3..4a2159062 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5355,11 +5355,11 @@ CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
 CONFIG_STACK_TRACER=y
@@ -6343,7 +6343,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 # CONFIG_XFRM_INTERFACE is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 10a41251f..874b14338 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5328,11 +5328,11 @@ CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 # CONFIG_STACKPROTECTOR_STRONG is not set
 CONFIG_STACK_TRACER=y
@@ -6316,7 +6316,7 @@ CONFIG_WM8350_WATCHDOG=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 # CONFIG_XFRM_INTERFACE is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index ddd48dae8..3c00472b5 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -6235,7 +6235,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 # CONFIG_XFRM_INTERFACE is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 5d70d5e5b..7f3d9f453 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -6208,7 +6208,7 @@ CONFIG_WM8350_WATCHDOG=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 # CONFIG_XFRM_INTERFACE is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index b1194d23f..bc57123c7 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5720,11 +5720,11 @@ CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STACKPROTECTOR=y
@@ -6775,7 +6775,7 @@ CONFIG_X86_UV=y
 # CONFIG_X86_VSMP is not set
 CONFIG_X86_X2APIC=y
 # CONFIG_X86_X32 is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_512GB=y
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_BACKEND=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 2217dbbd3..d64de5b82 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5695,11 +5695,11 @@ CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_HOST_SOC=y
+CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
-CONFIG_SSB=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STACKPROTECTOR=y
@@ -6750,7 +6750,7 @@ CONFIG_X86_UV=y
 # CONFIG_X86_VSMP is not set
 CONFIG_X86_X2APIC=y
 # CONFIG_X86_X32 is not set
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_512GB=y
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_BACKEND=y