From 4af17bffde7a1eca9ab164e5de0e391c277998a4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 14 Jun 2023 12:22:01 -0500 Subject: [PATCH] kernel-6.4.0-0.rc6.20230614gitb6dad5178cea.49 * Wed Jun 14 2023 Fedora Kernel Team [6.4.0-0.rc6.b6dad5178cea.49] - Remove CONFIG_ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes) - Fix up config and filter for PTP_DFL_TOD (Justin M. Forbes) - Linux v6.4.0-0.rc6.b6dad5178cea Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- filter-modules.sh.fedora | 2 +- kernel-aarch64-debug-fedora.config | 1 - kernel-aarch64-debug-rhel.config | 1 - kernel-aarch64-fedora.config | 1 - kernel-aarch64-rhel.config | 1 - kernel-x86_64-debug-fedora.config | 2 +- kernel.spec | 11 ++++++++--- sources | 6 +++--- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 076ae9c59..943e2e14a 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 = 48 +RHEL_RELEASE = 49 # # RHEL_REBASE_NUM diff --git a/filter-modules.sh.fedora b/filter-modules.sh.fedora index c6395d467..6649a7b5f 100755 --- a/filter-modules.sh.fedora +++ b/filter-modules.sh.fedora @@ -45,7 +45,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dsa ieee802154 l2t drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bli ptp_dfl_tod" # Grab the arch-specific filter list overrides source ./filter-$2.sh diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 291e0fc35..bc5c80ff7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -302,7 +302,6 @@ CONFIG_ARCH_BCM=y # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_EXYNOS is not set # CONFIG_ARCH_FOOTBRIDGE is not set -CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_ARCH_HISI=y # CONFIG_ARCH_INTEL_SOCFPGA is not set # CONFIG_ARCH_IOP32X is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 4e33e47f4..e06793d22 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -244,7 +244,6 @@ CONFIG_ARCH_BCM_IPROC=y # CONFIG_ARCH_BITMAIN is not set # CONFIG_ARCH_BRCMSTB is not set # CONFIG_ARCH_EXYNOS is not set -CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_ARCH_HISI=y # CONFIG_ARCH_INTEL_SOCFPGA is not set # CONFIG_ARCH_K3 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 3918379b7..5834c28e1 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -302,7 +302,6 @@ CONFIG_ARCH_BCM=y # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_EXYNOS is not set # CONFIG_ARCH_FOOTBRIDGE is not set -CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_ARCH_HISI=y # CONFIG_ARCH_INTEL_SOCFPGA is not set # CONFIG_ARCH_IOP32X is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 317c50e18..b0d87824f 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -244,7 +244,6 @@ CONFIG_ARCH_BCM_IPROC=y # CONFIG_ARCH_BITMAIN is not set # CONFIG_ARCH_BRCMSTB is not set # CONFIG_ARCH_EXYNOS is not set -CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_ARCH_HISI=y # CONFIG_ARCH_INTEL_SOCFPGA is not set # CONFIG_ARCH_K3 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 03e198fd7..9fbf0960e 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5237,7 +5237,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK_VMW=m CONFIG_PTP_1588_CLOCK=y -# CONFIG_PTP_DFL_TOD is not set +CONFIG_PTP_DFL_TOD=m # CONFIG_PUNIT_ATOM_DEBUG is not set CONFIG_PVH=y CONFIG_PVPANIC_MMIO=m diff --git a/kernel.spec b/kernel.spec index cf3cb8263..0f9a1f067 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.rc6.48 +%define pkgrelease 0.rc6.20230614gitb6dad5178cea.49 %define kversion 6 -%define tarfile_release 6.4-rc6 +%define tarfile_release 6.4-rc6-37-gb6dad5178cea # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.48%{?buildid}%{?dist} +%define specrelease 0.rc6.20230614gitb6dad5178cea.49%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3436,6 +3436,11 @@ fi # # %changelog +* Wed Jun 14 2023 Fedora Kernel Team [6.4.0-0.rc6.b6dad5178cea.49] +- Remove CONFIG_ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes) +- Fix up config and filter for PTP_DFL_TOD (Justin M. Forbes) +- Linux v6.4.0-0.rc6.b6dad5178cea + * Mon Jun 12 2023 Fedora Kernel Team [6.4.0-0.rc6.48] - Linux v6.4.0-0.rc6 diff --git a/sources b/sources index fe81ff63b..1f813c4c6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc6.tar.xz) = c5adc45407f884353d71da76c91b6d172ccb4129e8cc4cb60afabe507ef5ecde85242bac5698aebd7d1bbbb46d70e34380848b9d78e5eed5b35d538eb9f3d04d -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = eda90cba4e9942725d2dc2a6f0ec69c2ed5ffc73396b5c0084b499ee441757b0d2898aac27b04bd8548d1000425b6cffa53c160e65aa9901846e933781481180 -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = fb9975a9d9017b803856e4317af0c051c95950f15122833e7913b15546a384a7643dbee53404dd84f02ee7d0d2f3028d22c351f9a35d2f256333eda465b4c352 +SHA512 (linux-6.4-rc6-37-gb6dad5178cea.tar.xz) = cdda382e0b4013901fff28f13239d8eb8a3fa3f0f9027dd702b98d6452d303b2e9b5c9bc192ed9441ab12f09f64128933392b306fbc84b09a513eeaa7dbb2779 +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 59cae60bc2e7666998438cfb4b49f7f48c49a354223fcb8d0ff26f1b1bcdd1da6d565e36eaad505f71673e3820f865cfb3c6bdbf41b8a60e64122fd08baa4420 +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 810505a649769fe7c3321cce4e2c9d7d5a5a63646f269485eba6801a3b4fce7bfc492634856f271185f6707bbb4ee45eee0a280737887a9c59850c24d8ffc361