kernel-6.4.0-0.rc1.20230510git16a8829130ca.18

* Wed May 10 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc1.16a8829130ca.18] - Enable IO_URING for RHEL (Justin M. Forbes) - Linux v6.4.0-0.rc1.16a8829130ca Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2023-05-10 12:22:07 -05:00 · 2023-05-10 12:22:07 -05:00 · 0a64045405
parent 54efebccf6
commit 0a64045405
14 changed files with 33 additions and 40 deletions
--- 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 = 17
+RHEL_RELEASE = 18

 #
 # RHEL_REBASE_NUM
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/a880b0fb1a4b0e1526d80c3dc4555eb09d688d46
+ a880b0fb1a4b0e1526d80c3dc4555eb09d688d46 Enable IO_URING for RHEL
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/b619e4a64dcb734ca5839a50ae20d48a1fb2e2e9
 b619e4a64dcb734ca5839a50ae20d48a1fb2e2e9 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64

--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -2753,8 +2753,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -2737,8 +2737,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -2534,8 +2534,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -2518,8 +2518,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -2518,8 +2518,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -2502,8 +2502,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -2513,8 +2513,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -2705,8 +2705,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -2689,8 +2689,8 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SUBTREES is not set
--- a/kernel.spec
+++ b/kernel.spec
@ -148,13 +148,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.4.0
 %define specversion 6.4.0
 %define patchversion 6.4
-%define pkgrelease 0.rc1.20230509gitba0ad6ed89fd.17
+%define pkgrelease 0.rc1.20230510git16a8829130ca.18
 %define kversion 6
-%define tarfile_release 6.4-rc1-1-gba0ad6ed89fd
+%define tarfile_release 6.4-rc1-12-g16a8829130ca
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20230509gitba0ad6ed89fd.17%{?buildid}%{?dist}
+%define specrelease 0.rc1.20230510git16a8829130ca.18%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0

@ -3410,6 +3410,10 @@ fi
 #
 #
 %changelog
+* Wed May 10 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc1.16a8829130ca.18]
+- Enable IO_URING for RHEL (Justin M. Forbes)
+- Linux v6.4.0-0.rc1.16a8829130ca
+
 * Tue May 09 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc1.ba0ad6ed89fd.17]
 - Turn on IO_URING for RHEL in pending (Justin M. Forbes)
 - Linux v6.4.0-0.rc1.ba0ad6ed89fd
--- a/patch-6.4-redhat.patch
+++ b/patch-6.4-redhat.patch
@ -49,7 +49,6 @@
 include/linux/rh_kabi.h                            | 515 +++++++++++++++++++++
 include/linux/rmi.h                                |   1 +
 include/linux/security.h                           |   5 +
- init/Kconfig                                       |   2 +-
 kernel/Makefile                                    |   1 +
 kernel/bpf/syscall.c                               |  23 +
 kernel/module/main.c                               |   2 +
@ -62,7 +61,7 @@
 security/lockdown/Kconfig                          |  13 +
 security/lockdown/lockdown.c                       |   1 +
 security/security.c                                |  12 +
- 64 files changed, 1544 insertions(+), 190 deletions(-)
+ 63 files changed, 1543 insertions(+), 189 deletions(-)

 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 index 9e5bab29685f..223901a42a15 100644
@ -2506,19 +2505,6 @@ index e2734e9e44d5..52344c344e7a 100644
 #endif	/* CONFIG_SECURITY */

 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
-diff --git a/init/Kconfig b/init/Kconfig
-index 32c24950c4ce..bdcb8d104374 100644
--- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1645,7 +1645,7 @@ config AIO
- 	  this option saves about 7k.
-
- config IO_URING
-	bool "Enable IO uring support" if EXPERT
-+	bool "Enable IO uring support"
- 	select IO_WQ
- 	default y
- 	help
 diff --git a/kernel/Makefile b/kernel/Makefile
 index b69c95315480..6296043efe36 100644
 --- a/kernel/Makefile
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.4-rc1-1-gba0ad6ed89fd.tar.xz) = 0a35b5c668c08f60a17499282c3a5aff8e2449779ec0b94d050e47edcd41a4fec757451a3ece843e3910260f51e5047b8f237a29d070c677e0700162cc3e3992
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = b214fc8363ea137402114bd6babf4293740283f3fa159d28cae0f89224e840f8222084a3bc0e1a3def4cf2b79b4e81696721ed67e2842ae416564401a1f6b41e
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 5656d8cdd20adfa1f8a6c8e833e8ca80278adabdd31dc11b7f98d3dfb130666ad3a2ee4ba88dbabd0a8768376b2cbd919689ae82a3b614152b7072e1d097d204
+SHA512 (linux-6.4-rc1-12-g16a8829130ca.tar.xz) = 77b63afbe50eabd7215b6b4be2897b31e745e164418e1ecfd14a644ca8fd2082022eb39c3422b171969563e8a9e8683ee1e2f4950c8e0f2fe20a6c365ebe7fee
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = fd0d8ab5b849095f4852ccf0633edaca7f2dc3ff76be52b36c54bd8db27e84b274db49862d9627186b756ed85e1b85f573b13ae423ef2e52adf5e7ac3523e61c
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 7162767ac7aad2a71b8c039a7dbb998043a8ce759ac99aa5f0ff87e455b09ec19af539971faefaeec00a5fc36675aa2da3c4a623410d270866557b79efedaef5