From 12cfc85e21afaa01ddd3ef0fa9679e54925cde79 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 31 May 2023 13:57:32 -0500 Subject: [PATCH] kernel-6.4.0-0.rc4.20230531git48b1320a674e.37 * Wed May 31 2023 Fedora Kernel Team [6.4.0-0.rc4.48b1320a674e.37] - Linux v6.4.0-0.rc4.48b1320a674e Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- filter-modules.sh.rhel | 2 +- kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-rhel.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-rhel.config | 1 + kernel.spec | 12 +++++++++--- patch-6.4-redhat.patch | 2 +- sources | 6 +++--- 14 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index cb5bf1f10..1a1e2ffbd 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 = 36 +RHEL_RELEASE = 37 # # RHEL_REBASE_NUM diff --git a/filter-modules.sh.rhel b/filter-modules.sh.rhel index 6baf327b6..ae2122716 100755 --- a/filter-modules.sh.rhel +++ b/filter-modules.sh.rhel @@ -33,7 +33,7 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2 usbdrvs="atm image misc serial wusbcore" -fsdrvs="affs befs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs" +fsdrvs="affs befs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs smb squashfs sysv ubifs ufs" netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless" diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 375b998a4..70da17b37 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4872,6 +4872,7 @@ CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set CONFIG_REGMAP_KUNIT=m +CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 668872370..a8ec1b858 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4849,6 +4849,7 @@ CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set CONFIG_REGMAP_KUNIT=m +CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index de55f2ef3..0b6369bdd 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4529,6 +4529,7 @@ CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set CONFIG_REGMAP_KUNIT=m +CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index b7e2be4da..bdd0ac3f6 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4508,6 +4508,7 @@ CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set CONFIG_REGMAP_KUNIT=m +CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index e0073bb0d..ca2b960d5 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4472,6 +4472,7 @@ CONFIG_RD_ZSTD=y CONFIG_REALTEK_AUTOPM=y # CONFIG_REALTEK_PHY is not set # CONFIG_REED_SOLOMON_TEST is not set +# CONFIG_REGMAP is not set CONFIG_REGMAP_KUNIT=m # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 5cae5c51b..e2cb60e3a 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4451,6 +4451,7 @@ CONFIG_RD_ZSTD=y CONFIG_REALTEK_AUTOPM=y # CONFIG_REALTEK_PHY is not set # CONFIG_REED_SOLOMON_TEST is not set +# CONFIG_REGMAP is not set CONFIG_REGMAP_KUNIT=m # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e3cdac34c..17d554461 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4466,6 +4466,7 @@ CONFIG_RD_ZSTD=y CONFIG_REALTEK_AUTOPM=y # CONFIG_REALTEK_PHY is not set # CONFIG_REED_SOLOMON_TEST is not set +# CONFIG_REGMAP is not set CONFIG_REGMAP_KUNIT=m # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b1d55141d..48b2be5f9 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4710,6 +4710,7 @@ CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set CONFIG_REGMAP_KUNIT=m +CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index da69f934c..1e1eb9ac1 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4688,6 +4688,7 @@ CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set CONFIG_REGMAP_KUNIT=m +CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set diff --git a/kernel.spec b/kernel.spec index 263e8b638..3a1f7e5c2 100644 --- 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.rc4.20230530git8b817fded42d.36 +%define pkgrelease 0.rc4.20230531git48b1320a674e.37 %define kversion 6 -%define tarfile_release 6.4-rc4-31-g8b817fded42d +%define tarfile_release 6.4-rc4-51-g48b1320a674e # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20230530git8b817fded42d.36%{?buildid}%{?dist} +%define specrelease 0.rc4.20230531git48b1320a674e.37%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3415,6 +3415,12 @@ fi # # %changelog +* Wed May 31 2023 Justin M. Forbes [6.4.0-0.rc4.20230531git48b1320a674e.37] +- redhat: update filter-modules fsdrvs list to reference smb instead of cifs (Patrick Talbert) + +* Wed May 31 2023 Fedora Kernel Team [6.4.0-0.rc4.48b1320a674e.37] +- Linux v6.4.0-0.rc4.48b1320a674e + * Tue May 30 2023 Fedora Kernel Team [6.4.0-0.rc4.8b817fded42d.36] - Linux v6.4.0-0.rc4.8b817fded42d diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch index fa76b71a5..c24f334e7 100644 --- a/patch-6.4-redhat.patch +++ b/patch-6.4-redhat.patch @@ -2566,7 +2566,7 @@ index 14f39c1e573e..d221300ae815 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index 044aa2c9e3cb..2d646a3396ac 100644 +index 4e2cf784cf8c..66782bc8bc65 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -528,6 +528,7 @@ static struct module_attribute modinfo_##field = { \ diff --git a/sources b/sources index c2a13e13f..d6dbb8936 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc4-31-g8b817fded42d.tar.xz) = e0ba6e33929acdfa51ddbf6b7747135f8c87aeafc75642e548cb96805f05a512234785c342104f23e45f5da2e95ffba5bab52709b03f47bde187691f2d4ca07e -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = cb789a7beadc49ab06a829a1476c5de262117b21a4b8d489b95867ca7ea13a464f22abf97308f0cd3e7fa4c412f705d42c00606b8764cac88bbc4bbb0b6c62ba -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = db117fed2ef0cdf3c0401388ee6a570a50cd37e13d17917547bf28777858fbb3acd5c148e4269dc91246f16067ef5a0558040336335491e3eefa9a4ea32bc77b +SHA512 (linux-6.4-rc4-51-g48b1320a674e.tar.xz) = 99f31978ecac1698cf5e2bd017a487359a7e4ab476693d64599921aa0e8407f0ee5fa20fc3ba3136a807864cb2e7eda75a0cd86996fcae63ff6a610ecb58ea01 +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = da1156c0fe17c75ff63876791e06c8596dad28ff46968b26384ea372fbfa9dab29ba44877b56d53b2fe316a2021f05df9e32bcb6cc4361b8204793bf0a0a2e9e +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 00932948a6411d7100ce6dab63d7fa08081fe0d477c104f5815ee9a63199675b7aadf635de7eaabcde10889fbde357228e7990cc5318e2f2e57a24b348beb779