From 7240549a015623d06dcd4d96f023b29e068252db Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 22 Jun 2023 13:35:58 -0500 Subject: [PATCH] kernel-6.4.0-0.rc7.20230622gitdad9774deaf1.56 * Thu Jun 22 2023 Fedora Kernel Team [6.4.0-0.rc7.dad9774deaf1.56] - kernel.spec: drop obsolete ldconfig (Jan Stancek) - Consolidate config items to common for 6.4 cycle (Justin M. Forbes) - Turn on CO?NFIg_RMNET for Fedora (Justin M. Forbes) - Linux v6.4.0-0.rc7.dad9774deaf1 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 19 +++++++++---------- patch-6.4-redhat.patch | 4 ++-- sources | 6 +++--- 16 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 913f12fc1..5da85be4c 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 = 55 +RHEL_RELEASE = 56 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 7a2840282..1842c9988 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6244,7 +6244,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 7eb37e4c7..f02d29857 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6217,7 +6217,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 6b02c60e0..d29422d15 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6204,7 +6204,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index b6bb2bebe..7ddca2650 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6179,7 +6179,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 040596059..348febfe8 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6037,7 +6037,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 697425c89..08e8aa9ad 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6012,7 +6012,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 31e928759..7c0ce4aeb 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5148,7 +5148,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROHM_BU27034=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 3f08c2fec..ab5bc1e75 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5119,7 +5119,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROHM_BU27034=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 9e399aa6c..524e2a878 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5079,7 +5079,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROHM_BU27034=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 2e6278570..7d410698f 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5050,7 +5050,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROHM_BU27034=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index a6efcac57..caaeebd4d 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5508,7 +5508,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROHM_BU27034=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 65e2fd64a..d640a3a77 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5480,7 +5480,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROHM_BU27034=m diff --git a/kernel.spec b/kernel.spec index 261372120..5717efb38 100644 --- a/kernel.spec +++ b/kernel.spec @@ -174,13 +174,13 @@ Summary: The Linux kernel %define specrpmversion 6.4.0 %define specversion 6.4.0 %define patchversion 6.4 -%define pkgrelease 0.rc7.20230621gite660abd551f1.55 +%define pkgrelease 0.rc7.20230622gitdad9774deaf1.56 %define kversion 6 -%define tarfile_release 6.4-rc7-41-ge660abd551f1 +%define tarfile_release 6.4-rc7-72-gdad9774deaf1 # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20230621gite660abd551f1.55%{?buildid}%{?dist} +%define specrelease 0.rc7.20230622gitdad9774deaf1.56%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3390,13 +3390,6 @@ fi\ %endif %endif -%ifnarch noarch %{nobuildarches} -if [ -x /sbin/ldconfig ] -then - /sbin/ldconfig -X || exit $? -fi -%endif - ### ### file lists ### @@ -3707,6 +3700,12 @@ fi # # %changelog +* Thu Jun 22 2023 Fedora Kernel Team [6.4.0-0.rc7.dad9774deaf1.56] +- kernel.spec: drop obsolete ldconfig (Jan Stancek) +- Consolidate config items to common for 6.4 cycle (Justin M. Forbes) +- Turn on CO?NFIg_RMNET for Fedora (Justin M. Forbes) +- Linux v6.4.0-0.rc7.dad9774deaf1 + * Wed Jun 21 2023 Fedora Kernel Team [6.4.0-0.rc7.e660abd551f1.55] - redhat/configs: enable CONFIG_MANA_INFINIBAND=m for ARK (Vitaly Kuznetsov) - redhat/config: common: Enable CONFIG_GPIO_SIM for software development (Kate Hsuan) diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch index 2350da5fd..8874ed00f 100644 --- a/patch-6.4-redhat.patch +++ b/patch-6.4-redhat.patch @@ -542,7 +542,7 @@ index b51f2a4c821e..be31d32aba53 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index abeff7dc0b58..6384796e76dd 100644 +index 34b9e7876538..97bc2138bf74 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -32,6 +32,7 @@ @@ -553,7 +553,7 @@ index abeff7dc0b58..6384796e76dd 100644 #include -@@ -947,40 +948,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -926,40 +927,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif diff --git a/sources b/sources index 1dd2f1380..ac3dcfdba 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc7-41-ge660abd551f1.tar.xz) = d08776430e21ae5202c8c5a17911591954b4417aaa07248ba3311cd1090e283690e6d3487caf6207051a678daeea4adde8c62bf90a6c242abd4230da8a857473 -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 93b25f67d2e26ad9f637dcb91e5e32b94ef6bff87ed8000a2dcf491b89a4d19cea802c1956f0b4d453c80189aff3e1da908f3a08aef901264047b4a6ed90e7d7 -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 4a0849835bcd98378127dad5e783a6e95179f4b3ce951f4e6fc203fed9d291d37938177623e15584a71c32ae898d63df75c9f7ed7f7f89ef0ee31a82507215e5 +SHA512 (linux-6.4-rc7-72-gdad9774deaf1.tar.xz) = bfc89a21db05d615d4a591e2fe0cbae9a1411094142df61d900a8f8781614011cc5cdffc27fcebd6716f9e8445a5208b20cec508abac34daeef4a2262f652c49 +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 1e6ce4dd5cbdf0f3d543a9e063f4ad02cfa516f5cdc0173c697bae8aa0da38d528939d6af95c23aef8d97ae1aeb01bb1f3e3e2e93f0c839921930258c8c47af6 +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 6d0746b4314421a8f9284d8334e3bc5f01a1ec5578305480aaf7e2df0b39427b0e3bcdfa648488c8a6065d4464f5565286c86c44462b4912a3247096b0335c0f