kernel-6.4.0-0.rc7.20230622gitdad9774deaf1.56

* Thu Jun 22 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2023-06-22 13:35:58 -05:00
parent 923f6ac7fb
commit 7240549a01
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
16 changed files with 27 additions and 28 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <kernel-team@fedoraproject.org> [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 <kernel-team@fedoraproject.org> [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)

View File

@ -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 <asm/early_ioremap.h>
@@ -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

View File

@ -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