From 5a2988aff0950c259628c8a9c036dbe5258cbf81 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 12 Aug 2022 08:12:58 -0500 Subject: kernel-5.20.0-0.rc0.20220812git7ebfc85e2cd7.10 * Fri Aug 12 2022 Fedora Kernel Team [5.20.0-0.rc0.3bc1bc0b59d0.8] - Add python3-setuptools buildreq for perf (Justin M. Forbes) - Add cros_kunit to mod-internal.list (Justin M. Forbes) - Add new tests to mod-internal.list (Justin M. Forbes) - Turn off some Kunit tests in pending (Justin M. Forbes) - Clean up a mismatch in Fedora configs (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 4 ++++ kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 4 ++++ kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 4 ++++ kernel-armv7hl-fedora.config | 4 ++++ kernel-armv7hl-lpae-debug-fedora.config | 4 ++++ kernel-armv7hl-lpae-fedora.config | 4 ++++ kernel-ppc64le-debug-fedora.config | 4 ++++ kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 4 ++++ kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 4 ++++ kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 4 ++++ kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 4 ++++ kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 4 ++++ kernel-x86_64-rhel.config | 1 + kernel.spec | 11 +++++++---- patch-5.20-redhat.patch | 34 ++++++++++++++++----------------- sources | 6 +++--- 25 files changed, 85 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index d30523e7a..a68e6b9df 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 8 +RHEL_RELEASE = 10 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index b5e592893..ded0997a7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5418,9 +5418,11 @@ CONFIG_PINCTRL_MESON_GXBB=y CONFIG_PINCTRL_MESON_GXL=y CONFIG_PINCTRL_MESON_S4=y CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set CONFIG_PINCTRL_MSM8226=m # CONFIG_PINCTRL_MSM8660 is not set +# CONFIG_PINCTRL_MSM8909 is not set CONFIG_PINCTRL_MSM8916=m # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8960 is not set @@ -5451,11 +5453,13 @@ CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6350 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index f88fd6e15..e18419e13 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4303,6 +4303,7 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8660 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b8d51d69d..e16f49b1b 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5397,9 +5397,11 @@ CONFIG_PINCTRL_MESON_GXBB=y CONFIG_PINCTRL_MESON_GXL=y CONFIG_PINCTRL_MESON_S4=y CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set CONFIG_PINCTRL_MSM8226=m # CONFIG_PINCTRL_MSM8660 is not set +# CONFIG_PINCTRL_MSM8909 is not set CONFIG_PINCTRL_MSM8916=m # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8960 is not set @@ -5430,11 +5432,13 @@ CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6350 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ad5c5a41a..461613cd4 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4280,6 +4280,7 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8660 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index f1eecf6d7..db013d0e6 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5462,9 +5462,11 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set CONFIG_PINCTRL_MSM8226=m CONFIG_PINCTRL_MSM8660=m +# CONFIG_PINCTRL_MSM8909 is not set CONFIG_PINCTRL_MSM8916=m # CONFIG_PINCTRL_MSM8953 is not set CONFIG_PINCTRL_MSM8960=m @@ -5495,11 +5497,13 @@ CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6350 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y CONFIG_PINCTRL_SUN4I_A10=y # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index edfde4cea..a0740f688 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5443,9 +5443,11 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set CONFIG_PINCTRL_MSM8226=m CONFIG_PINCTRL_MSM8660=m +# CONFIG_PINCTRL_MSM8909 is not set CONFIG_PINCTRL_MSM8916=m # CONFIG_PINCTRL_MSM8953 is not set CONFIG_PINCTRL_MSM8960=m @@ -5476,11 +5478,13 @@ CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6350 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y CONFIG_PINCTRL_SUN4I_A10=y # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 6bfed5f94..0b3a1544b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5345,8 +5345,10 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set CONFIG_PINCTRL_MSM8226=m +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM8994 is not set @@ -5372,11 +5374,13 @@ CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6350 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y CONFIG_PINCTRL_SUN4I_A10=y # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 88113b394..d4951cf2b 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5326,8 +5326,10 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set CONFIG_PINCTRL_MSM8226=m +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM8994 is not set @@ -5353,11 +5355,13 @@ CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6350 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y CONFIG_PINCTRL_SUN4I_A10=y # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 87433b041..54664f74d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4562,8 +4562,10 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM is not set @@ -4573,11 +4575,13 @@ CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC7180 is not set # CONFIG_PINCTRL_SC8180X is not set # CONFIG_PINCTRL_SDM660 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index e7de78146..54e133351 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4073,6 +4073,7 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8976 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 014314ceb..c3b1a8158 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4541,8 +4541,10 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM is not set @@ -4552,11 +4554,13 @@ CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC7180 is not set # CONFIG_PINCTRL_SC8180X is not set # CONFIG_PINCTRL_SDM660 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 4833efbe4..5051a523e 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4052,6 +4052,7 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8976 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 7bfd57ff6..4bdbb7d4c 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4538,8 +4538,10 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM is not set @@ -4549,11 +4551,13 @@ CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC7180 is not set # CONFIG_PINCTRL_SC8180X is not set # CONFIG_PINCTRL_SDM660 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 5221c711d..e7f1cf597 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4054,6 +4054,7 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8976 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b9701659b..5deaf71ad 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4517,8 +4517,10 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM is not set @@ -4528,11 +4530,13 @@ CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC7180 is not set # CONFIG_PINCTRL_SC8180X is not set # CONFIG_PINCTRL_SDM660 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index c72c9b004..1e09a2251 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4033,6 +4033,7 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8976 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index db9988995..808a7f270 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4047,6 +4047,7 @@ CONFIG_PINCTRL_LAKEFIELD=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8976 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index bf3efbf72..86ceb4ed5 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4928,8 +4928,10 @@ CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_LYNXPOINT=m # CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM is not set @@ -4939,11 +4941,13 @@ CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC7180 is not set # CONFIG_PINCTRL_SC8180X is not set # CONFIG_PINCTRL_SDM660 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 11d9d42a1..ea30c8e23 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4272,6 +4272,7 @@ CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8976 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e4be54bfd..9a85361ea 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4908,8 +4908,10 @@ CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_LYNXPOINT=m # CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set +# CONFIG_PINCTRL_MSM8909 is not set # CONFIG_PINCTRL_MSM8953 is not set # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM is not set @@ -4919,11 +4921,13 @@ CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC7180 is not set # CONFIG_PINCTRL_SC8180X is not set # CONFIG_PINCTRL_SDM660 is not set +# CONFIG_PINCTRL_SM6375 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set # CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_SUN20I_D1=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN50I_A100 is not set # CONFIG_PINCTRL_SUN50I_A100_R is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index f20a1cf8e..369794008 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4251,6 +4251,7 @@ CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_METEORLAKE is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8976 is not set diff --git a/kernel.spec b/kernel.spec index 1ad4a3bf6..428f307af 100755 --- a/kernel.spec +++ b/kernel.spec @@ -124,13 +124,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.20.0 %define patchversion 5.20 -%define pkgrelease 0.rc0.20220809git1ab9250751ee.8 +%define pkgrelease 0.rc0.20220812git7ebfc85e2cd7.10 %define kversion 5 -%define tarfile_release 5.19-12716-g1ab9250751ee +%define tarfile_release 5.19-13930-g7ebfc85e2cd7 # This is needed to do merge window version magic %define patchlevel 20 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220809git1ab9250751ee.8%{?buildid}%{?dist} +%define specrelease 0.rc0.20220812git7ebfc85e2cd7.10%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.20.0 @@ -3138,7 +3138,10 @@ fi # # %changelog -* Wed Aug 10 2022 Justin M. Forbes [5.20.0-0.rc0.20220809git1ab9250751ee.8] +* Fri Aug 12 2022 Fedora Kernel Team [5.20.0-0.rc0.3bc1bc0b59d0.8] +- Add python3-setuptools buildreq for perf (Justin M. Forbes) +- Add cros_kunit to mod-internal.list (Justin M. Forbes) +- Add new tests to mod-internal.list (Justin M. Forbes) - Turn off some Kunit tests in pending (Justin M. Forbes) - Clean up a mismatch in Fedora configs (Justin M. Forbes) diff --git a/patch-5.20-redhat.patch b/patch-5.20-redhat.patch index f5713c242..4dff34ab7 100644 --- a/patch-5.20-redhat.patch +++ b/patch-5.20-redhat.patch @@ -68,10 +68,10 @@ 67 files changed, 1547 insertions(+), 188 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index bab2b0bf5988..5b8e4ea0d0af 100644 +index db5de5f0b9d3..b7db309ab887 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6377,6 +6377,15 @@ +@@ -6391,6 +6391,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index dc6295f91263..c2c9bac44473 100644 +index 5f5c43a52455..353133d8245e 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -135,7 +135,7 @@ index dc6295f91263..c2c9bac44473 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1245,7 +1249,13 @@ define filechk_version.h +@@ -1251,7 +1255,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -251,10 +251,10 @@ index ed4fbbbdd1b0..fbc9fcf681c2 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 736262a76a12..4c410c845a8f 100644 +index 64a73f415f03..2955e1c6f757 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1524,6 +1524,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) +@@ -1532,6 +1532,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) cpu_detect(c); get_cpu_vendor(c); get_cpu_cap(c); @@ -2551,10 +2551,10 @@ index 1bc362cb413f..961600d0572d 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/init/Kconfig b/init/Kconfig -index 8c9ad53b45dc..64f0c68e1cfb 100644 +index 80fe60fa77fb..ab664cf7ed79 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1689,7 +1689,7 @@ config AIO +@@ -1682,7 +1682,7 @@ config AIO this option saves about 7k. config IO_URING @@ -2576,7 +2576,7 @@ index 318789c728d3..148911cf65da 100644 obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 83c7136c5788..dfb60d30d794 100644 +index a4d40d98428a..2cb611a26fdc 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -2611,7 +2611,7 @@ index 83c7136c5788..dfb60d30d794 100644 int sysctl_unprivileged_bpf_disabled __read_mostly = IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; -@@ -5254,6 +5272,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -5269,6 +5287,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; @@ -2624,7 +2624,7 @@ index 83c7136c5788..dfb60d30d794 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index 57fc2821be63..d7cdcfa19546 100644 +index 6a477c622544..f4dbf3591f20 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -523,6 +523,7 @@ static struct module_attribute modinfo_##field = { \ @@ -2633,9 +2633,9 @@ index 57fc2821be63..d7cdcfa19546 100644 MODINFO_ATTR(srcversion); +MODINFO_ATTR(rhelversion); - static char last_unloaded_module[MODULE_NAME_LEN+1]; - -@@ -965,6 +966,7 @@ struct module_attribute *modinfo_attrs[] = { + static struct { + char name[MODULE_NAME_LEN + 1]; +@@ -970,6 +971,7 @@ struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, &modinfo_srcversion, @@ -2906,7 +2906,7 @@ index 000000000000..586c3319f530 +} +EXPORT_SYMBOL(mark_partner_supported); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 29474cee10b1..8ecabc1b1686 100644 +index 55e32af2e53f..eda59a076309 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ @@ -2917,7 +2917,7 @@ index 29474cee10b1..8ecabc1b1686 100644 /* Are we using CONFIG_MODVERSIONS? */ static bool modversions; -@@ -2317,6 +2318,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -2132,6 +2133,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -2930,7 +2930,7 @@ index 29474cee10b1..8ecabc1b1686 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2380,6 +2387,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2195,6 +2202,7 @@ static void write_mod_c_file(struct module *mod) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff --git a/sources b/sources index 4a00425ae..a0a3f7d8a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.19-12716-g1ab9250751ee.tar.xz) = dc2075dbc062f49af6c2019aa78552810e507d3f78d6d6f99ea8abee6cf763ff717139d065550a3edd7b0b53fa2fd157c72d12bf857f6f8ec43a94f4bb5ef8ae -SHA512 (kernel-abi-stablelists-5.20.0.tar.bz2) = 4720755de05b7826d3352327b0c55350d89b7c52522c4c1fe36db26cfb40727bdadb351d2cf871a143f2b273309faaced15afe5e8fa98a0871b553390ac0f370 -SHA512 (kernel-kabi-dw-5.20.0.tar.bz2) = a04a55eb65610a6fd2998e23b6f74da44754edd44883da5849f04fbfbcd2a5fc9c752270857847f8df24d86c0c9c99db95d32e6e877fc379921bcd10bb6ba7f2 +SHA512 (linux-5.19-13930-g7ebfc85e2cd7.tar.xz) = 2b8549a9ec945bf785de1792b73f33e93b9e1a98cd2fa05fdab5b9827bed2c41ad12c126899eede35ad5bb0ae3ce022ad3652ca6203b86db47b80e188528f24f +SHA512 (kernel-abi-stablelists-5.20.0.tar.bz2) = 237bd6498e17e4112f4eab8e7026d4ebe16c99002d082bffd16e1ce48e8a80a43b9fc73e40792469e3473b17d48a84ee15c13094d25cee964f2c2734a0df1bcc +SHA512 (kernel-kabi-dw-5.20.0.tar.bz2) = e571c7b4736e8b18aae08c7e5e9d2e5031210262ed4b0bdce0eb1375715f3dbd775bfb40446b5a6ada5a4b8f3cba2eed2851bf58e841d789bbd01aabb532d82a -- cgit