summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog4
-rw-r--r--kernel-aarch64-debug-fedora.config1
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-fedora.config1
-rw-r--r--kernel-aarch64-rhel.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rw-r--r--kernel-ppc64le-debug-fedora.config1
-rw-r--r--kernel-ppc64le-debug-rhel.config1
-rw-r--r--kernel-ppc64le-fedora.config1
-rw-r--r--kernel-ppc64le-rhel.config1
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-debug-rhel.config1
-rw-r--r--kernel-x86_64-fedora.config1
-rw-r--r--kernel-x86_64-rhel.config1
-rwxr-xr-xkernel.spec27
-rw-r--r--patch-5.18-redhat.patch2
-rw-r--r--sources6
26 files changed, 24 insertions, 40 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 4f1fce49c..92236dda5 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 = 11
+RHEL_RELEASE = 12
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index e8996299a..37bd4efe5 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c015135563ccdec9ca69ab4ca1fb97cbb905b18d
- c015135563ccdec9ca69ab4ca1fb97cbb905b18d mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/9b7bccf83a9f4bcfec141e14bc64737463ad4456
+ 9b7bccf83a9f4bcfec141e14bc64737463ad4456 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
"https://gitlab.com/cki-project/kernel-ark/-/commit"/8e648aae90c1d739b5ead43fb84c2cae550a8344
8e648aae90c1d739b5ead43fb84c2cae550a8344 Fix up rng merge
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 28eea604d..e11961530 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3893,7 +3893,6 @@ CONFIG_MFD_HI6421_SPMI=m
CONFIG_MFD_HI655X_PMIC=m
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index d945dbd3d..ea01672b4 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -581,7 +581,6 @@ CONFIG_BPF_LSM=y
CONFIG_BPF_STREAM_PARSER=y
CONFIG_BPF_SYSCALL=y
CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-CONFIG_BQL=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -3085,7 +3084,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_HI655X_PMIC is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index b2cf89fc8..1583b3d10 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3869,7 +3869,6 @@ CONFIG_MFD_HI6421_SPMI=m
CONFIG_MFD_HI655X_PMIC=m
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index f3cac97d2..720313de2 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -581,7 +581,6 @@ CONFIG_BPF_LSM=y
CONFIG_BPF_STREAM_PARSER=y
CONFIG_BPF_SYSCALL=y
CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-CONFIG_BQL=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -3064,7 +3063,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_HI655X_PMIC is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index d50e42f1a..2e6304ff3 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3945,7 +3945,6 @@ CONFIG_MFD_EXYNOS_LPASS=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 474d72f42..cf8ac5743 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3922,7 +3922,6 @@ CONFIG_MFD_EXYNOS_LPASS=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 9ccf44e7b..fb93f63e8 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -3866,7 +3866,6 @@ CONFIG_MFD_EXYNOS_LPASS=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index d10a967f8..d93aa06c7 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -3843,7 +3843,6 @@ CONFIG_MFD_EXYNOS_LPASS=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 5985eeca8..acbd04c8d 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -3287,7 +3287,6 @@ CONFIG_MFD_ENE_KB3930=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 02c263974..77d8c9c15 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2912,7 +2912,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_HI655X_PMIC is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 3cb6fc524..11a48f548 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -3263,7 +3263,6 @@ CONFIG_MFD_ENE_KB3930=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index cf33b22ec..2bb3bea27 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2894,7 +2894,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_HI655X_PMIC is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 40df5b06e..fa3676ca7 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -3269,7 +3269,6 @@ CONFIG_MFD_ENE_KB3930=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 3db7928d1..b043612f0 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2897,7 +2897,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_HI655X_PMIC is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 65584f490..1e941e665 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -3245,7 +3245,6 @@ CONFIG_MFD_ENE_KB3930=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index e04a876f0..30a382fe2 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2879,7 +2879,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_HI655X_PMIC is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 0345ffe6a..c0b35407e 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2891,7 +2891,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_HI655X_PMIC is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index e34ee255f..460fe16cd 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -3562,7 +3562,6 @@ CONFIG_MFD_INTEL_LPSS_ACPI=y
CONFIG_MFD_INTEL_LPSS_PCI=y
CONFIG_MFD_INTEL_M10_BMC=m
CONFIG_MFD_INTEL_PMC_BXT=m
-CONFIG_MFD_INTEL_PMT=m
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 7070e7e9c..baedf426d 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -3078,7 +3078,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=y
CONFIG_MFD_INTEL_LPSS=y
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-CONFIG_MFD_INTEL_PMT=m
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index e13b1fb85..d9790258b 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -3539,7 +3539,6 @@ CONFIG_MFD_INTEL_LPSS_ACPI=y
CONFIG_MFD_INTEL_LPSS_PCI=y
CONFIG_MFD_INTEL_M10_BMC=m
CONFIG_MFD_INTEL_PMC_BXT=m
-CONFIG_MFD_INTEL_PMT=m
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 9557ecd50..28373001d 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -3058,7 +3058,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=y
CONFIG_MFD_INTEL_LPSS=y
# CONFIG_MFD_INTEL_M10_BMC is not set
# CONFIG_MFD_INTEL_PMC_BXT is not set
-CONFIG_MFD_INTEL_PMT=m
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/kernel.spec b/kernel.spec
index 69ac0d86a..d990a2019 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.20220329git1930a6e739c4.11
+%global distro_build 0.rc0.20220330gitd888c83fcec7.12
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.18.0
%define patchversion 5.18
-%define pkgrelease 0.rc0.20220329git1930a6e739c4.11
+%define pkgrelease 0.rc0.20220330gitd888c83fcec7.12
# This is needed to do merge window version magic
%define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20220329git1930a6e739c4.11%{?buildid}%{?dist}
+%define specrelease 0.rc0.20220330gitd888c83fcec7.12%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-12882-g1930a6e739c4.tar.xz
+Source0: linux-5.17-13034-gd888c83fcec7.tar.xz
Source1: Makefile.rhelver
@@ -1390,8 +1390,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17-12882-g1930a6e739c4 -c
-mv linux-5.17-12882-g1930a6e739c4 linux-%{KVERREL}
+%setup -q -n kernel-5.17-13034-gd888c83fcec7 -c
+mv linux-5.17-13034-gd888c83fcec7 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2246,7 +2246,7 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
%{tools_make}
popd
pushd tools/power/x86/intel-speed-select
- %{make}
+ %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS+="-lnl-genl-3 -lnl-3"
popd
%endif
%endif
@@ -2511,7 +2511,7 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
%{tools_make} DESTDIR=%{buildroot} install
popd
pushd tools/power/x86/intel-speed-select
- %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude" DESTDIR=%{buildroot} install
+ %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS+="-lnl-genl-3 -lnl-3" DESTDIR=%{buildroot} install
popd
%endif
pushd tools/thermal/tmon
@@ -3018,10 +3018,17 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.1930a6e739c4.10]
-- Avoid creating files in $RPM_SOURCE_DIR (Nicolas Chauvet)
+* Wed Mar 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.d888c83fcec7.11]
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
+* Wed Mar 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.d888c83fcec7.10]
+- redhat/config: Remove obsolete CONFIG_MFD_INTEL_PMT (David Arcari)
+- redhat/configs: enable CONFIG_INTEL_ISHTP_ECLITE (David Arcari)
+- Avoid creating files in $RPM_SOURCE_DIR (Nicolas Chauvet)
+- Flip CRC64 from off to y (Justin M. Forbes)
+- New configs in lib/Kconfig (Fedora Kernel Team)
+- disable redundant assignment of CONFIG_BQL on ARK (Davide Caratti)
+
* Tue Mar 29 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.1930a6e739c4.9]
- redhat/configs: remove unnecessary GPIO options for aarch64 (Brian Masney)
- redhat/configs: remove viperboard related Kconfig options (Brian Masney)
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch
index c34295b75..29c98aac8 100644
--- a/patch-5.18-redhat.patch
+++ b/patch-5.18-redhat.patch
@@ -160,7 +160,7 @@ index c28c5d91e5c8..509e4e0c7780 100644
$(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index c1251856ef77..fefe78477b23 100644
+index 2e8091e2d8a8..32e0403314b1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1486,9 +1486,9 @@ config HIGHMEM
diff --git a/sources b/sources
index c48ea3111..e84ecae88 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-12882-g1930a6e739c4.tar.xz) = a2bdc70927403e0ecbf3379a03b21c857a533d8c760dc0fa6f68ff89a2981d0ae0e79cb493f191321a673e84cee940eb56b6d2d8fef0a96648a5670410bab03b
-SHA512 (kernel-abi-stablelists-5.18.0-0.rc0.20220329git1930a6e739c4.11.tar.bz2) = 69134523ab96f5f7662ab2fd8cc34cffb728465b4520be1610189e036df6adc94bdf57cc7f7b9bd139d0e96daf9e153d7f8c313a03122a9b74e56f89ec1c277a
-SHA512 (kernel-kabi-dw-5.18.0-0.rc0.20220329git1930a6e739c4.11.tar.bz2) = 212d5ab4975a6d09033f584720becc03d89c05cac83b25a5712e78801d96a632d4f35bf1b0d57afca3b86f4cd405ac310624af9cbbbe0b120d57d75ed1c66208
+SHA512 (linux-5.17-13034-gd888c83fcec7.tar.xz) = 5dae1bd656da0bccac6ebeded09669993fef8625c697a1fddda2c20d80ac7823b6160dca064b6edd978bcc3c7c9a48c28f6c5f4c4ca5a96904254cd91fe83855
+SHA512 (kernel-abi-stablelists-5.18.0-0.rc0.20220330gitd888c83fcec7.12.tar.bz2) = 119e43c486e35b543e6b6951d6b122be69c6905d45c3b9bd0d3361962f6cf0281422738d27eaf46afb227ca20eef17e5d5c4c16889dd7187b4913e80d7dd9375
+SHA512 (kernel-kabi-dw-5.18.0-0.rc0.20220330gitd888c83fcec7.12.tar.bz2) = c9cf51e3d9dececfead7e45221377b3077db81126f4cf891b20f9f316f3bf61595d876242a23a9b9f17e1d14b764d44bfb96e8e08f4ea48f4eef976092033d26