From 25f6fd2dffbafb0c81c486ad0ec94ef64613a6ca Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 4 Apr 2023 12:24:40 -0500 Subject: [PATCH] kernel-6.3.0-0.rc5.20230404git148341f0a2f5.43 * Tue Apr 04 2023 Fedora Kernel Team [6.3.0-0.rc5.148341f0a2f5.43] - Update Fedora arm filters after config updates (Nicolas Chauvet) - redhat/kernel.spec.template: Fix kernel-tools-libs-devel dependency (Prarit Bhargava) - redhat: fix the check for the n option (Patrick Talbert) - common: de-dupe some options that are the same (Peter Robinson) - generic: remove deleted options (Peter Robinson) - Linux v6.3.0-0.rc5.148341f0a2f5 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- filter-armv7hl.sh.fedora | 2 +- kernel-aarch64-debug-fedora.config | 4 +--- kernel-aarch64-debug-rhel.config | 2 -- kernel-aarch64-fedora.config | 4 +--- kernel-aarch64-rhel.config | 2 -- kernel-armv7hl-debug-fedora.config | 4 +--- kernel-armv7hl-fedora.config | 4 +--- kernel-armv7hl-lpae-debug-fedora.config | 4 +--- kernel-armv7hl-lpae-fedora.config | 4 +--- kernel-ppc64le-debug-fedora.config | 4 +--- kernel-ppc64le-debug-rhel.config | 2 -- kernel-ppc64le-fedora.config | 4 +--- kernel-ppc64le-rhel.config | 2 -- kernel-s390x-debug-fedora.config | 4 +--- kernel-s390x-debug-rhel.config | 2 -- kernel-s390x-fedora.config | 4 +--- kernel-s390x-rhel.config | 2 -- kernel-s390x-zfcpdump-rhel.config | 2 -- kernel-x86_64-debug-fedora.config | 4 +--- kernel-x86_64-debug-rhel.config | 2 -- kernel-x86_64-fedora.config | 4 +--- kernel-x86_64-rhel.config | 2 -- kernel.spec | 16 ++++++++++++---- sources | 6 +++--- 25 files changed, 29 insertions(+), 63 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 645be0a98..3b8bbb40f 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 = 42 +RHEL_RELEASE = 43 # # ZSTREAM diff --git a/filter-armv7hl.sh.fedora b/filter-armv7hl.sh.fedora index e773b396a..d35fd843e 100644 --- a/filter-armv7hl.sh.fedora +++ b/filter-armv7hl.sh.fedora @@ -15,4 +15,4 @@ ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco d drmdrvs="amd arm armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm nouveau omapdrm panel pl111 radeon rockchip sti stm sun4i tegra tilcdc tiny vc4" -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 bq27xxx_battery_hdq mlx5_vdpa dfl-emif spi-altera-dfl hid-playstation hid-nintendo" +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 bq27xxx_battery_hdq mlx5_vdpa dfl-emif spi-altera-dfl hid-playstation hid-nintendo intel-m10-bmc-pmci" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d7c7cbcc8..a9bb47b87 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2357,7 +2357,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6924,7 +6923,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y CONFIG_SERIAL_8250_OMAP=y -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -8397,7 +8396,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index f323a4b6d..490812aa9 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1838,7 +1838,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6691,7 +6690,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y CONFIG_UCSI_CCG=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 3eb1405e0..1d9edfbe6 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2340,7 +2340,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6897,7 +6896,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y CONFIG_SERIAL_8250_OMAP=y -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -8368,7 +8367,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b1785a82f..b38205de9 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1822,7 +1822,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6666,7 +6665,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y CONFIG_UCSI_CCG=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index ec909e4c8..867dc45eb 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2356,7 +2356,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6915,7 +6914,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y CONFIG_SERIAL_8250_OMAP=y -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_PXA=y @@ -8439,7 +8438,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 78e90751f..2892e3822 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2340,7 +2340,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6890,7 +6889,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y CONFIG_SERIAL_8250_OMAP=y -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_PXA=y @@ -8412,7 +8411,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 9cca416c4..00a444921 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2310,7 +2310,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6736,7 +6735,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y CONFIG_SERIAL_8250_OMAP=y -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -8208,7 +8207,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index f7c3d029c..3363ba4e4 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2294,7 +2294,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6711,7 +6710,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y CONFIG_SERIAL_8250_OMAP=y -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -8181,7 +8180,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 71a591635..79ef22649 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1853,7 +1853,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -5783,7 +5782,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -7058,7 +7057,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 33bfb6837..adc4d5394 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1643,7 +1643,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6369,7 +6368,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y # CONFIG_UCSI_CCG is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 94eb94471..bcfede47e 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1834,7 +1834,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -5754,7 +5753,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -7027,7 +7026,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index bf73a17bd..c0b8afba5 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1627,7 +1627,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6346,7 +6345,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y # CONFIG_UCSI_CCG is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c87a6edf5..21748b0b5 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1860,7 +1860,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -5725,7 +5724,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -7011,7 +7010,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index b40ad5cc6..d600b77c3 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1650,7 +1650,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6358,7 +6357,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y # CONFIG_UCSI_CCG is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index fb8bd011b..c0cd43853 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1841,7 +1841,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -5696,7 +5695,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -6980,7 +6979,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 21cc8a99b..0c6c17415 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1634,7 +1634,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6335,7 +6334,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y # CONFIG_UCSI_CCG is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 616ef3aa9..7c5c466b9 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1640,7 +1640,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6361,7 +6360,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y # CONFIG_UCSI_CCG is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index c2f05b316..100f70776 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2026,7 +2026,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6144,7 +6143,7 @@ CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -7468,7 +7467,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 52802790c..ecbb50bd8 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1753,7 +1753,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6608,7 +6607,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y # CONFIG_UCSI_CCG is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 6a4f3bf58..f3eedb070 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2007,7 +2007,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6116,7 +6115,7 @@ CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_PCI1XXXX=m +CONFIG_SERIAL_8250_PCI1XXXX=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_8250_RSA=y @@ -7438,7 +7437,6 @@ CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=m CONFIG_UCSI_CCG=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 96516d17a..f94a7bc3d 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1737,7 +1737,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set @@ -6584,7 +6583,6 @@ CONFIG_UAPI_HEADER_TEST=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS is not set # CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_UCLAMP_TASK is not set CONFIG_UCSI_ACPI=y # CONFIG_UCSI_CCG is not set diff --git a/kernel.spec b/kernel.spec index 2fa6a051a..ba51ddcbf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -143,13 +143,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.3.0 %define patchversion 6.3 -%define pkgrelease 0.rc5.42 +%define pkgrelease 0.rc5.20230404git148341f0a2f5.43 %define kversion 6 -%define tarfile_release 6.3-rc5 +%define tarfile_release 6.3-rc5-5-g148341f0a2f5 # This is needed to do merge window version magic %define patchlevel 3 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.42%{?buildid}%{?dist} +%define specrelease 0.rc5.20230404git148341f0a2f5.43%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.3.0 @@ -1061,7 +1061,7 @@ Requires: %{package_name}-tools = %{version}-%{release} Provides: cpupowerutils-devel = 1:009-0.6.p1 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1 %endif -Requires: %{package_name}-libs = %{version}-%{release} +Requires: %{package_name}-tools-libs = %{version}-%{release} Provides: %{package_name}-tools-devel %description -n %{package_name}-tools-libs-devel This package contains the development files for the tools/ directory from @@ -3360,6 +3360,14 @@ fi # # %changelog +* Tue Apr 04 2023 Fedora Kernel Team [6.3.0-0.rc5.148341f0a2f5.43] +- Update Fedora arm filters after config updates (Nicolas Chauvet) +- redhat/kernel.spec.template: Fix kernel-tools-libs-devel dependency (Prarit Bhargava) +- redhat: fix the check for the n option (Patrick Talbert) +- common: de-dupe some options that are the same (Peter Robinson) +- generic: remove deleted options (Peter Robinson) +- Linux v6.3.0-0.rc5.148341f0a2f5 + * Mon Apr 03 2023 Fedora Kernel Team [6.3.0-0.rc5.42] - Linux v6.3.0-0.rc5 diff --git a/sources b/sources index e3b66b9a2..e1189e4c3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.3-rc5.tar.xz) = 851fde27401e687cbdb664d48a0f890db512c41e31d0e27a3aa3343fddebfa3fe864cd13aee5b6b549f3f2460ba61a74eba65414b2c73d2437c087c71c11e6ff -SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = b7b6a5c79ef7a6b2e215e94332773fa48ba87ca63c645833721733083f85ddede6af56d4de3f6c31b193a5685253920c4b359bbf5efac4be2ddb0fc2000cbba8 -SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 06e858208a4206ded69ea4d478e805e39293a1c9134f59da50d1d3f8411136fe258954f1cf062db25e61868588c82d025dd90a0bb7641beaa23d81775e173568 +SHA512 (linux-6.3-rc5-5-g148341f0a2f5.tar.xz) = 6de4782420245632447d0ab83804979723a52e23ddeb58226658b0f7af430324724f97acceb4289c6e6cc89561290404df47a9ec617bdc523541a915032db897 +SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = b7cc83370757b1e0ef98838c875ba4aeec51aaf5a51be64205a154ea68d6f686bc22d6bc2c278af7128cd480a11fd2876e499eea8607e5457162a44063283f59 +SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 08dc14227122c1e994be7cc54cc337b59e8f61ebf3d089d62b1049743d4506058622ace2963b869f4ebe47f5af7d5897a2044b2c342b3c385d403674eb3a41e1