From 7742d1f7fd40a95649b59f203e0d0861e7cbaf9e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 12 Sep 2022 18:47:18 +0100 Subject: kernel-6.0.0-0.rc5.37 * Mon Sep 12 2022 Fedora Kernel Team [6.0.0-0.rc5.37] - configs/fedora: Make Fedora work with HNS3 network adapter (Zamir SUN) - redhat/configs/fedora/generic: Enable CONFIG_BLK_DEV_UBLK on Fedora (Richard W.M. Jones) [2122595] - fedora: disable IWLMEI (Peter Robinson) - Linux v6.0.0-0.rc5 Resolves: rhbz#2122595 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 15 +++++++++++++-- kernel-aarch64-fedora.config | 15 +++++++++++++-- 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 | 4 ++-- kernel-x86_64-fedora.config | 4 ++-- kernel.spec | 20 ++++++++++++++++---- patch-6.0-redhat.patch | 14 +++++++------- sources | 6 +++--- 16 files changed, 65 insertions(+), 31 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index ccca41829..611e8bc3e 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 = 34 +RHEL_RELEASE = 37 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 53596cd7c..a2c633d04 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -763,7 +763,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set @@ -2692,8 +2692,10 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGH_RES_TIMERS=y +# CONFIG_HIP04_ETH is not set # CONFIG_HIPPI is not set CONFIG_HISI_DMA=m +# CONFIG_HISI_FEMAC is not set CONFIG_HISI_HIKEY_USB=m CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161600802=y @@ -2704,9 +2706,17 @@ CONFIG_HISI_PMU=y CONFIG_HISI_THERMAL=m # CONFIG_HIST_TRIGGERS_DEBUG is not set CONFIG_HIST_TRIGGERS=y +# CONFIG_HIX5HD2_GMAC is not set CONFIG_HMC425=m # CONFIG_HMC6352 is not set +CONFIG_HNS3_DCB=y +CONFIG_HNS3_ENET=m +CONFIG_HNS3_HCLGE=m +CONFIG_HNS3_HCLGEVF=m +CONFIG_HNS3=m # CONFIG_HNS3_PMU is not set +CONFIG_HNS_DSAF=m +CONFIG_HNS_ENET=m CONFIG_HOLTEK_FF=y # CONFIG_HOSTAP is not set CONFIG_HOTPLUG_CPU=y @@ -3042,6 +3052,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_ERDMA is not set +# CONFIG_INFINIBAND_HNS is not set CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y @@ -4757,7 +4768,7 @@ CONFIG_NET_VENDOR_FREESCALE=y # CONFIG_NET_VENDOR_FUJITSU is not set CONFIG_NET_VENDOR_FUNGIBLE=y CONFIG_NET_VENDOR_GOOGLE=y -# CONFIG_NET_VENDOR_HISILICON is not set +CONFIG_NET_VENDOR_HISILICON=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 66aee9e0c..b253c830d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -763,7 +763,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set @@ -2676,8 +2676,10 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGH_RES_TIMERS=y +# CONFIG_HIP04_ETH is not set # CONFIG_HIPPI is not set CONFIG_HISI_DMA=m +# CONFIG_HISI_FEMAC is not set CONFIG_HISI_HIKEY_USB=m CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161600802=y @@ -2688,9 +2690,17 @@ CONFIG_HISI_PMU=y CONFIG_HISI_THERMAL=m # CONFIG_HIST_TRIGGERS_DEBUG is not set CONFIG_HIST_TRIGGERS=y +# CONFIG_HIX5HD2_GMAC is not set CONFIG_HMC425=m # CONFIG_HMC6352 is not set +CONFIG_HNS3_DCB=y +CONFIG_HNS3_ENET=m +CONFIG_HNS3_HCLGE=m +CONFIG_HNS3_HCLGEVF=m +CONFIG_HNS3=m # CONFIG_HNS3_PMU is not set +CONFIG_HNS_DSAF=m +CONFIG_HNS_ENET=m CONFIG_HOLTEK_FF=y # CONFIG_HOSTAP is not set CONFIG_HOTPLUG_CPU=y @@ -3026,6 +3036,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_ERDMA is not set +# CONFIG_INFINIBAND_HNS is not set CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y @@ -4737,7 +4748,7 @@ CONFIG_NET_VENDOR_FREESCALE=y # CONFIG_NET_VENDOR_FUJITSU is not set CONFIG_NET_VENDOR_FUNGIBLE=y CONFIG_NET_VENDOR_GOOGLE=y -# CONFIG_NET_VENDOR_HISILICON is not set +CONFIG_NET_VENDOR_HISILICON=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e4f790bc0..30be0bd87 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -769,7 +769,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index e1e8142b6..bcfa3f6e3 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -769,7 +769,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 88fc6928b..1d48b131a 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -748,7 +748,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index fed337393..a4617991c 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -748,7 +748,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index b84e210ce..c272987aa 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -537,7 +537,7 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 020a2da85..1b76d6eb4 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -536,7 +536,7 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c8a6985e1..dab921cf3 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -541,7 +541,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index f3697bf8d..35d5724bf 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -540,7 +540,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 022fd47df..4a0a93057 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -587,7 +587,7 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set @@ -3068,7 +3068,7 @@ CONFIG_IWLDVM=m CONFIG_IWLEGACY_DEBUGFS=y CONFIG_IWLEGACY_DEBUG=y CONFIG_IWLEGACY=m -CONFIG_IWLMEI=m +# CONFIG_IWLMEI is not set CONFIG_IWLMVM=m # CONFIG_IWLWIFI_BCAST_FILTERING is not set CONFIG_IWLWIFI_DEBUGFS=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 6d5e2c325..e3af30f82 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -586,7 +586,7 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UBLK is not set +CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y # CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set @@ -3051,7 +3051,7 @@ CONFIG_IWLDVM=m CONFIG_IWLEGACY_DEBUGFS=y CONFIG_IWLEGACY_DEBUG=y CONFIG_IWLEGACY=m -CONFIG_IWLMEI=m +# CONFIG_IWLMEI is not set CONFIG_IWLMVM=m # CONFIG_IWLWIFI_BCAST_FILTERING is not set CONFIG_IWLWIFI_DEBUGFS=y diff --git a/kernel.spec b/kernel.spec index f1fd307d0..beedc23b2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,17 +120,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # define buildid .local %define specversion 6.0.0 %define patchversion 6.0 -%define pkgrelease 0.rc4.20220909git506357871c18.34 +%define pkgrelease 0.rc5.37 %define kversion 6 -%define tarfile_release 6.0-rc4-137-g506357871c18 +%define tarfile_release 6.0-rc5 # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220909git506357871c18.34%{?buildid}%{?dist} +%define specrelease 0.rc5.37%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.0.0 @@ -3147,6 +3147,18 @@ fi # # %changelog +* Mon Sep 12 2022 Fedora Kernel Team [6.0.0-0.rc5.37] +- configs/fedora: Make Fedora work with HNS3 network adapter (Zamir SUN) +- redhat/configs/fedora/generic: Enable CONFIG_BLK_DEV_UBLK on Fedora (Richard W.M. Jones) [2122595] +- fedora: disable IWLMEI (Peter Robinson) +- Linux v6.0.0-0.rc5 + +* Sun Sep 11 2022 Fedora Kernel Team [6.0.0-0.rc4.b96fbd602d35.36] +- Linux v6.0.0-0.rc4.b96fbd602d35 + +* Sat Sep 10 2022 Fedora Kernel Team [6.0.0-0.rc4.ce888220d5c7.35] +- Linux v6.0.0-0.rc4.ce888220d5c7 + * Fri Sep 09 2022 Fedora Kernel Team [6.0.0-0.rc4.506357871c18.34] - Linux v6.0.0-0.rc4.506357871c18 diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index 293931cc8..d29b05994 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index a4f71076cacb..a6f13827b133 100644 +index a5e9d9388649..ca96ff659d46 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -167,7 +167,7 @@ index 87badeae3181..2ec7919034d8 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 9fb9fff08c94..6f6392f33711 100644 +index 1ce7685ad5de..101f1d767658 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1182,7 +1182,7 @@ endchoice @@ -229,7 +229,7 @@ index 1cc85b8ff42e..b7ee128c67ce 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index ed4fbbbdd1b0..fbc9fcf681c2 100644 +index bbd4bde4f65d..dd60114ae9c1 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -240,7 +240,7 @@ index ed4fbbbdd1b0..fbc9fcf681c2 100644 #include #include -@@ -967,6 +968,9 @@ void __init setup_arch(char **cmdline_p) +@@ -968,6 +969,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -1112,7 +1112,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 780fb7071577..b5eb4f837b44 100644 +index 3a808146b50f..c1a3f3057921 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ @@ -1246,7 +1246,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 af367b22871b..3c5b7917b7b2 100644 +index 66446f1e06cf..29fccce7ba4e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1684,7 +1684,7 @@ index f6c37a97544e..a1488544300e 100644 /* Fusion */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index def37a7e5980..5d8de7690b82 100644 +index bd6a5f1bd532..3d460a12baa3 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -12606,6 +12606,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) diff --git a/sources b/sources index 0b22407df..b5075fc5b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.0-rc4-137-g506357871c18.tar.xz) = eab72ed52c81035f36333b09d0467d78aa4e4f6e5063ce49ebc6f939e470e91e93601578311f9f9f38e0cf135dbffe30b963716855feb5cb5cbaee27b5171bf1 -SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 877cdccd9e71784af3db10fd6f90c1ce43bb432816504ef8287602da0993fc4977932019f8dca8d08228efa36696063628342466a819ba6caa3376bd7b2395b4 -SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = dac69949256ff541ae48a1ebc819deb1860f2f85f35de16bc55ff09ec1e23f2c4354a8aa0b971f86e342be5dbaa6553607abf9f034a8ff6cb7f79326773073ca +SHA512 (linux-6.0-rc5.tar.xz) = 1893078550da0469dd4f643de9959a70d502ed485fa226131c1f2a275be6bbe62f391ad7b504113b07cd2c093a3ac221d14476c15c965e0be431f73dc11e539a +SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 9b0d2ea32163d364d5aec4b173ffb7f6fbeab713234797740ce88e38908b057847dbfe1f3c85a3aa42511fc83cb59f3e1e4fbdd80e1a88ca21d24978a8e1c73a +SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 35b67572658a9be2218afe9a984ca2d1cfbc1c191e138eee482a7dd840b7bbb83f7839a6a040b0b875fc1167cb3682e0ae4c121e7587e8da2b9f65c105ac9f9d -- cgit