kernel-5.18.0-0.rc0.b4a5ea09b293.13

* Thu Mar 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.b4a5ea09b293.13]
- Add clk_test and clk-gate_test to mod-internal.list (Justin M. Forbes)
- redhat/kernel.spec.template: Fix intel-speed-select compile (Prarit Bhargava)
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

26 files changed, 42 insertions, 22 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index ea5512351..107c1b5e1 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 = 13
+RHEL_RELEASE = 14
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index a8c7618a5..29c14047e 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/aa4ced52321898b847145fe2a34214b4398ad377
- aa4ced52321898b847145fe2a34214b4398ad377 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ffcd4b99fd9e12abd9f05dc2b2e10ee9a11fe86d
+ ffcd4b99fd9e12abd9f05dc2b2e10ee9a11fe86d 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 2c2837286..c3b4f8d89 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2255,6 +2255,7 @@ CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_MGR_ZYNQMP_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index d933f701b..15d2e2601 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1731,6 +1731,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index f4329e1fe..f0760ccfb 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2239,6 +2239,7 @@ CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_MGR_ZYNQMP_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 41878d1e6..00739ffee 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1715,6 +1715,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 3f77e0698..59cd9a922 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2288,6 +2288,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index fe7c6532f..d227ca136 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2273,6 +2273,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index ae6a01e7b..e8e633a5a 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2242,6 +2242,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 38c13ba36..df3273b23 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2227,6 +2227,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index f60cc9545..33d33af70 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1812,6 +1812,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index c0259a5ea..929c1cd92 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1571,6 +1571,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 834d49c62..3aeb66bed 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1795,6 +1795,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 9593ecc31..32ae2c67b 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1555,6 +1555,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index bb8d9106c..0389e8907 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1817,6 +1817,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 11f40e2c0..c95b90a47 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1575,6 +1575,7 @@ CONFIG_FM10K=m
 CONFIG_FONT_SUPPORT=m
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 72ef8c8d6..04b1ea670 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1800,6 +1800,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 32dea8baf..f5d8605f0 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1559,6 +1559,7 @@ CONFIG_FM10K=m
 CONFIG_FONT_SUPPORT=m
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 4a03bd473..5e48b7079 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1565,6 +1565,7 @@ CONFIG_FM10K=m
 CONFIG_FONT_SUPPORT=m
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index e3796dfca..c02225cfa 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1979,6 +1979,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 09b465be8..6570544b3 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1676,6 +1676,7 @@ CONFIG_FM10K=m
 CONFIG_FONT_SUPPORT=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 6f6f6c616..a04f75c57 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1962,6 +1962,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
+# CONFIG_FPROBE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 6d81e620c..8a0a9eef3 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1660,6 +1660,7 @@ CONFIG_FM10K=m
 CONFIG_FONT_SUPPORT=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set
+# CONFIG_FPROBE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
diff --git a/kernel.spec b/kernel.spec
index 27aebfd35..590881f10 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.20220331git787af64d05cd.13
+%global distro_build 0.rc0.20220331gitb4a5ea09b293.14
 
 %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.20220331git787af64d05cd.13
+%define pkgrelease 0.rc0.20220331gitb4a5ea09b293.14
 
 # This is needed to do merge window version magic
 %define patchlevel 18
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20220331git787af64d05cd.13%{?buildid}%{?dist}
+%define specrelease 0.rc0.20220331gitb4a5ea09b293.14%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -242,8 +242,6 @@ Summary: The Linux kernel
 %define with_selftests 0
 %endif
 
-%define with_tools 0
-
 %if %{with_verbose}
 %define make_opts V=1
 %else
@@ -700,7 +698,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-13430-g787af64d05cd.tar.xz
+Source0: linux-5.17-13532-gb4a5ea09b293.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1392,8 +1390,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.17-13430-g787af64d05cd -c
-mv linux-5.17-13430-g787af64d05cd linux-%{KVERREL}
+%setup -q -n kernel-5.17-13532-gb4a5ea09b293 -c
+mv linux-5.17-13532-gb4a5ea09b293 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2248,7 +2246,7 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
    %{tools_make}
    popd
    pushd tools/power/x86/intel-speed-select
-   %{make} CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS="%{__global_ldflags} -lnl-genl-3 -lnl-3"
+   %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS+="-lnl-genl-3 -lnl-3"
    popd
 %endif
 %endif
@@ -2513,7 +2511,7 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
    %{tools_make} DESTDIR=%{buildroot} install
    popd
    pushd tools/power/x86/intel-speed-select
-   %{make} CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS="%{__global_ldflags} -lnl-genl-3 -lnl-3" 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
@@ -3020,7 +3018,8 @@ fi
 #
 #
 %changelog
-* Thu Mar 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.787af64d05cd.12]
+* Thu Mar 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.b4a5ea09b293.13]
+- Add clk_test and clk-gate_test to mod-internal.list (Justin M. Forbes)
 - redhat/kernel.spec.template: Fix intel-speed-select compile (Prarit Bhargava)
 - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
 
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch
index 5eda5519d..5b1257c4d 100644
--- a/patch-5.18-redhat.patch
+++ b/patch-5.18-redhat.patch
@@ -130,7 +130,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index c28c5d91e5c8..509e4e0c7780 100644
+index 18ecb49f1af6..8e964bc4843e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -144,7 +144,7 @@ index c28c5d91e5c8..509e4e0c7780 100644
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
-@@ -1234,7 +1238,13 @@ define filechk_version.h
+@@ -1242,7 +1246,13 @@ define filechk_version.h
  	((c) > 255 ? 255 : (c)))';                                       \
  	echo \#define LINUX_VERSION_MAJOR $(VERSION);                    \
  	echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL);            \
@@ -158,7 +158,7 @@ index c28c5d91e5c8..509e4e0c7780 100644
 +	echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"'
  endef
 
- $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)
+ $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0)
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
 index 2e8091e2d8a8..32e0403314b1 100644
 --- a/arch/arm/Kconfig
@@ -2933,7 +2933,7 @@ index 25b3ef71f495..d37a6c88c69f 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index 97463a33baa7..9275dae4d368 100644
+index ddcbefe535e9..5061ef5ba38b 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
 @@ -1649,7 +1649,7 @@ config AIO
@@ -2946,7 +2946,7 @@ index 97463a33baa7..9275dae4d368 100644
  	default y
  	help
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 56f4ee97f328..2dfcaac71418 100644
+index 471d71935e90..bb93ae663f1e 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -12,6 +12,7 @@ obj-y     = fork.o exec_domain.o panic.o \
diff --git a/sources b/sources
index f2222f1e0..0708c3ddb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-13430-g787af64d05cd.tar.xz) = 48ac8135c16ab084e5290391a002c1a89317b9392125e30b22033dd7e14b5e0dc83cbe4371801e37260574ee60d44da512577953a6d356d3494875fcbb3d949c
-SHA512 (kernel-abi-stablelists-5.18.0-0.rc0.20220331git787af64d05cd.13.tar.bz2) = 51cb93b1188044d39cdde03b063f934a7ec71474e79464d4a6d88946f8606f3ba5ee3b76afa624b3874384067790e0c08cdaa81bd38e3ec3890a8e8ebf259d30
-SHA512 (kernel-kabi-dw-5.18.0-0.rc0.20220331git787af64d05cd.13.tar.bz2) = 9faef4aaec8f60e2d6d6209aaf2773b9ddac705eca32da07837138ed008246df105120925fb8a37ab6ab90b8fe468fbcc4774628f4af639582398990bf9e4de1
+SHA512 (linux-5.17-13532-gb4a5ea09b293.tar.xz) = d7a7bcc4504b05d917dd57369e76a66f4d6be10205ada9e1e310688c06d616c0d6eba93493c30b4fd5a06ad5525a34501c6460bc38cb08edad45286b5e3bc60a
+SHA512 (kernel-abi-stablelists-5.18.0-0.rc0.20220331gitb4a5ea09b293.14.tar.bz2) = 380b854341131fa3fa13a217e23897f45d9225061e4f9e36c350416d8126fc0d0d09b34ed38f52abece9e9919fd86af66f8868ec79beffb8505a5db04356d36f
+SHA512 (kernel-kabi-dw-5.18.0-0.rc0.20220331gitb4a5ea09b293.14.tar.bz2) = 67760b3032a42da3fe6e4964dc4611fdaed8df304e52520a60c070e2e7d55d7c9b1f44fc7a1f1f9150d78711b52e9901ee2c7ca79bf29100fb9abfec9a950b29