kernel-6.3.0-0.rc3.30

* Mon Mar 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc3.30] - kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes (Marco Elver) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2023-03-20 08:35:07 -05:00 · 2023-03-20 08:35:07 -05:00 · 488d9f40ef
parent 88bb20744f
commit 488d9f40ef
17 changed files with 39 additions and 28 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 = 27
+RHEL_RELEASE = 30

 #
 # ZSTREAM
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f7fcb74da25f39866045ddd624caff8f799d557e
- f7fcb74da25f39866045ddd624caff8f799d557e kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f1b65f0549b810c1419ae7d4b91664df4f89d30
+ 4f1b65f0549b810c1419ae7d4b91664df4f89d30 kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes

 "https://gitlab.com/cki-project/kernel-ark/-/commit"/8d2cc85c7080506ecb798e46a48a3cdb89bbb175
 8d2cc85c7080506ecb798e46a48a3cdb89bbb175 redhat: version two of Makefile.rhelver tweaks
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -4853,7 +4853,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -4827,7 +4827,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -4840,7 +4840,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -4816,7 +4816,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -4743,7 +4743,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -4719,7 +4719,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -4081,7 +4081,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -4053,7 +4053,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -4060,7 +4060,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -4032,7 +4032,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -4389,7 +4389,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -4363,7 +4363,7 @@ CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
-# CONFIG_NET_SCH_FQ_PIE is not set
+CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HHF=m
--- a/kernel.spec
+++ b/kernel.spec
@ -143,13 +143,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.3.0
 %define patchversion 6.3
-%define pkgrelease 0.rc2.20230317git38e04b3e4240.27
+%define pkgrelease 0.rc3.30
 %define kversion 6
-%define tarfile_release 6.3-rc2-77-g38e04b3e4240
+%define tarfile_release 6.3-rc3
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20230317git38e04b3e4240.27%{?buildid}%{?dist}
+%define specrelease 0.rc3.30%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.3.0

@ -3363,9 +3363,20 @@ fi
 #
 #
 %changelog
-* Fri Mar 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.38e04b3e4240.27]
+* Mon Mar 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc3.30]
 - kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes (Marco Elver)

+* Mon Mar 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc3.29]
+- Linux v6.3.0-0.rc3
+
+* Sun Mar 19 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.a3671bd86a97.28]
+- Linux v6.3.0-0.rc2.a3671bd86a97
+
+* Sat Mar 18 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.478a351ce0d6.27]
+- Use RHJOBS for create-tarball (Don Zickus)
+- Enable CONFIG_NET_SCH_FQ_PIE for Fedora (Justin M. Forbes)
+- Linux v6.3.0-0.rc2.478a351ce0d6
+
 * Fri Mar 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.38e04b3e4240.26]
 - Make Fedora debug configs more useful for debug (Justin M. Forbes)
 - redhat/configs: enable Octeon TX2 network drivers for RHEL (Michal Schmidt) [2040643]
--- a/patch-6.3-redhat.patch
+++ b/patch-6.3-redhat.patch
@ -123,7 +123,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index c933ceb4f21d..76949a7c7475 100644
+index a2c310df2145..5b7c0413e3cd 100644
 --- a/Makefile
 +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -145,7 +145,7 @@ index c933ceb4f21d..76949a7c7475 100644
 # We are using a recursive build, so we need to do a little thinking
 # to get the ordering right.
 #
-@@ -1335,7 +1347,13 @@ define filechk_version.h
+@@ -1334,7 +1346,13 @@ define filechk_version.h
 	((c) > 255 ? 255 : (c)))';                                       \
 	echo \#define LINUX_VERSION_MAJOR $(VERSION);                    \
 	echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL);            \
@ -1308,7 +1308,7 @@ index ee4da9ab8013..d395d11eadc4 100644
 	if (ret < 0)
 		goto err_allowedips;
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index c2730b116dc6..6e35eeb6ed9f 100644
+index d4be525f8100..3ee03d5dff9d 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
@@ -251,6 +251,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -1375,7 +1375,7 @@ index c2730b116dc6..6e35eeb6ed9f 100644
 #ifdef CONFIG_NVME_AUTH
 		queue_work(nvme_wq, &ctrl->dhchap_auth_work);
 diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index fc39d01e7b63..a3d68d41be11 100644
+index 9171452e2f6d..289bbb3523ce 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@ -2030,10 +2030,10 @@ index 979b776e3bcb..4eabcc0d8a91 100644

 struct taint_flag {
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index fafd8020c6d7..913ac81ccf34 100644
+index b50e5c79f7e3..14c622041b43 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
-@@ -1522,6 +1522,22 @@ int pci_add_dynid(struct pci_driver *drv,
+@@ -1523,6 +1523,22 @@ int pci_add_dynid(struct pci_driver *drv,
 		  unsigned long driver_data);
 const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
 					 struct pci_dev *dev);
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.3-rc2-77-g38e04b3e4240.tar.xz) = 7bae93d14c239b4b4c67c1a4134211d247a1370d00e652b5781a90bcad5527d4c94126b6c288650a81cee698de3d0d4e528afcbabdc2c9bcce2c8af850629131
-SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 6dbd5b3b785ea2446a1d93468300ecfca999edf2e9542ccdfbb07e0f47871b14223ee6c6bfe07225e9c11169f32abd2789932429264f27fe03efaae8d2dd2870
-SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 53d2a6e44a4dda0c33b8801c2eaeb5c91ee9aa7d71dfae2ea4b3cc8673dba278f83ccdc8e88bb2aed9ebd79b1c74ff5ca2345634f31b6e06c4018d535f46a9e3
+SHA512 (linux-6.3-rc3.tar.xz) = fcdff16ea1bde9092ea6cdd070f6c5f274b8c73704a6cba45e5d51cd9cff9bc6598db4b6fe1224f36d9b7e99a2e2eba69f991ddb91569eb42f9f315f803f5284
+SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = e4c45a5f8cd0d22df4a4a3626c3d9a826eeedf95b60dfd3b6df52136135bb9cc8111e034b0ffd61064e68e32a0c25af7d6ed3b3b588df310e81993d8c41d3d15
+SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 5ba073af6be5bd01a62bc91d587e73c0795e280bcd18f10314fb3ebcb8cea88c802658073161c2b10b0a75db142bae94961c7ed3c1f621c9c2a42af6d3328636