From 0adbf80812d1b549736536ed42d5a7b1b14d0129 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 17 Dec 2023 12:21:39 -0600 Subject: [PATCH] kernel-6.7.0-0.rc5.20231217git3b8a9b2e6809.47 * Sun Dec 17 2023 Fedora Kernel Team [6.7.0-0.rc5.3b8a9b2e6809.47] - Linux v6.7.0-0.rc5.3b8a9b2e6809 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 5 +---- kernel-aarch64-16k-fedora.config | 5 +---- kernel-aarch64-debug-fedora.config | 5 +---- kernel-aarch64-fedora.config | 5 +---- kernel-ppc64le-debug-fedora.config | 5 +---- kernel-ppc64le-fedora.config | 5 +---- kernel-s390x-debug-fedora.config | 5 +---- kernel-s390x-fedora.config | 5 +---- kernel.spec | 12 +++++++++--- sources | 6 +++--- 11 files changed, 21 insertions(+), 39 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 6645cf390..61c2648c5 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 = 46 +RHEL_RELEASE = 47 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index f1f9f810d..ea4b143da 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -2698,7 +2698,6 @@ CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -3082,7 +3081,6 @@ CONFIG_I2C_HID=y CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_IMX=m # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MESON=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m @@ -8176,7 +8174,6 @@ CONFIG_SPI_HISI_SFC=m # CONFIG_SPI_HISI_SFC_V3XX is not set CONFIG_SPI_IMX=m # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y @@ -9078,7 +9075,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m # CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index b719487b2..2749419f2 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -2681,7 +2681,6 @@ CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -3065,7 +3064,6 @@ CONFIG_I2C_HID=y CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_IMX=m # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MESON=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m @@ -8147,7 +8145,6 @@ CONFIG_SPI_HISI_SFC=m # CONFIG_SPI_HISI_SFC_V3XX is not set CONFIG_SPI_IMX=m # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y @@ -9049,7 +9046,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m # CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 8f650937d..7c8195d20 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2698,7 +2698,6 @@ CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -3082,7 +3081,6 @@ CONFIG_I2C_HID=y CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_IMX=m # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MESON=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m @@ -8176,7 +8174,6 @@ CONFIG_SPI_HISI_SFC=m # CONFIG_SPI_HISI_SFC_V3XX is not set CONFIG_SPI_IMX=m # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y @@ -9078,7 +9075,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m # CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1ed3157d7..825dff0ab 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2681,7 +2681,6 @@ CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -3065,7 +3064,6 @@ CONFIG_I2C_HID=y CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_IMX=m # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MESON=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m @@ -8147,7 +8145,6 @@ CONFIG_SPI_HISI_SFC=m # CONFIG_SPI_HISI_SFC_V3XX is not set CONFIG_SPI_IMX=m # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y @@ -9049,7 +9046,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m # CONFIG_USB_M66592 is not set CONFIG_USB_MA901=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 7454bec9f..6f185f2e3 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2158,7 +2158,6 @@ CONFIG_GPIO_FXL6408=m # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -2486,7 +2485,6 @@ CONFIG_I2C_HID=y # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m CONFIG_I2C_MPC=m @@ -6858,7 +6856,6 @@ CONFIG_SPI_FSL_LPSPI=m # CONFIG_SPI_HISI_SFC_V3XX is not set # CONFIG_SPI is not set # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_MEM is not set CONFIG_SPI_MICROCHIP_CORE=m @@ -7582,7 +7579,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 757dc64d2..31b8bba03 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2139,7 +2139,6 @@ CONFIG_GPIO_FXL6408=m # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -2466,7 +2465,6 @@ CONFIG_I2C_HID=y # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m CONFIG_I2C_MPC=m @@ -6827,7 +6825,6 @@ CONFIG_SPI_FSL_LPSPI=m # CONFIG_SPI_HISI_SFC_V3XX is not set # CONFIG_SPI is not set # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_MEM is not set CONFIG_SPI_MICROCHIP_CORE=m @@ -7551,7 +7548,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 5e2d4e44f..621c97dc9 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2149,7 +2149,6 @@ CONFIG_GPIO_FXL6408=m # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -2464,7 +2463,6 @@ CONFIG_I2C_HID=y # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m # CONFIG_I2C_MUX_GPIO is not set @@ -6784,7 +6782,6 @@ CONFIG_SPI_FSL_LPSPI=m # CONFIG_SPI_HISI_SFC_V3XX is not set # CONFIG_SPI is not set # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_MEM is not set CONFIG_SPI_MICROCHIP_CORE=m @@ -7519,7 +7516,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e31ccdf91..f7225663b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2130,7 +2130,6 @@ CONFIG_GPIO_FXL6408=m # CONFIG_GPIO_LATCH is not set CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB=y -CONFIG_GPIO_LJCA=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MAX3191X is not set # CONFIG_GPIO_MAX7300 is not set @@ -2444,7 +2443,6 @@ CONFIG_I2C_HID=y # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set -CONFIG_I2C_LJCA=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m # CONFIG_I2C_MUX_GPIO is not set @@ -6753,7 +6751,6 @@ CONFIG_SPI_FSL_LPSPI=m # CONFIG_SPI_HISI_SFC_V3XX is not set # CONFIG_SPI is not set # CONFIG_SPI_LANTIQ_SSC is not set -CONFIG_SPI_LJCA=m # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_MEM is not set CONFIG_SPI_MICROCHIP_CORE=m @@ -7488,7 +7485,7 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m # CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_LJCA=m +# CONFIG_USB_LJCA is not set CONFIG_USB_M5602=m CONFIG_USB_MA901=m # CONFIG_USB_MASS_STORAGE is not set diff --git a/kernel.spec b/kernel.spec index 22ad38907..05cb79967 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc5.20231216gitc8e97fc6b4c0.46 +%define pkgrelease 0.rc5.20231217git3b8a9b2e6809.47 %define kversion 6 -%define tarfile_release 6.7-rc5-214-gc8e97fc6b4c0 +%define tarfile_release 6.7-rc5-230-g3b8a9b2e6809 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20231216gitc8e97fc6b4c0.46%{?buildid}%{?dist} +%define specrelease 0.rc5.20231217git3b8a9b2e6809.47%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3754,6 +3754,12 @@ fi\ # # %changelog +* Sun Dec 17 2023 Justin M. Forbes [6.7.0-0.rc5.20231217git3b8a9b2e6809.47] +- Fix up Fedora LJCA configs and filters (Justin M. Forbes) + +* Sun Dec 17 2023 Fedora Kernel Team [6.7.0-0.rc5.3b8a9b2e6809.47] +- Linux v6.7.0-0.rc5.3b8a9b2e6809 + * Sat Dec 16 2023 Fedora Kernel Team [6.7.0-0.rc5.c8e97fc6b4c0.46] - Fedora configs for 6.7 (Justin M. Forbes) - Linux v6.7.0-0.rc5.c8e97fc6b4c0 diff --git a/sources b/sources index 189b7c064..a2e793246 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.7-rc5-214-gc8e97fc6b4c0.tar.xz) = b1cb57fe428fec3c6604a6003b9cfc8d6c66c52ab3094d9a79611cecded236acc04bf44601ea5ba336ca8e89e2d0bd81cb5306d92017d29fc51ff3ae7266da65 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = fec6ff716acde6693e54e3b0d0e17926d7b25f98c41ad3205683dd220356c5b7feefd066758375b47f06e0fa493d5dd86f1bf4661de2dfaae994c9893165daa9 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 513174a7fc5727d52c992fdc3603511aeb7a1479e81038c5735947fb510252cc1d971286968264da2db08cfb8d2e12db5411adb6acad9b71a0f48f3b27ce9f7a +SHA512 (linux-6.7-rc5-230-g3b8a9b2e6809.tar.xz) = 5e833a43a7a0a26479eca87d6a04b272d1d79fadccd80f5d331b2bd7857e2d9d6c09f965ab7a8d50182b616f7179953107f55e1c1015d3b96f5453beb31a7ab8 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = dc71688a3c4ac4c5d2c62500b6d2e7da118fd8d7c9d7c46b56d4e7f20b88fbbe50defa16bed5147a5a9ed66a076546f354a0c4efd83c6fd317b96bb0d612aab5 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = f276ba0dc662b556ac404425d3994f3f041386f159a1b4c3a274b2b20d92158a5348f671ec3757e39f86beed9c59281f27c48f302459349e0307889450bafdd9