From acfa19b1a49e04342d104ef632c02c7acb09b5ae Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Wed, 21 Jun 2023 15:35:45 -0300 Subject: [PATCH] kernel-6.3.9-200 * Wed Jun 21 2023 Augusto Caringi [6.3.9-0] - Turn on CONFIG_RMNET for Fedora (Justin M. Forbes) - redhat/config: common: Enable CONFIG_GPIO_SIM for software development (Kate Hsuan) - Add the MT7922 Bluetooth bug to BugsFixed (Augusto Caringi) - Bluetooth: Add VID/PID 0489/e0e4 for MediaTek MT7922 (Meng Tang) - Linux v6.3.9 Resolves: Signed-off-by: Augusto Caringi --- Patchlist.changelog | 3 ++ 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 | 15 +++++-- patch-6.3-redhat.patch | 53 +++++++++---------------- sources | 6 +-- 25 files changed, 69 insertions(+), 74 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 35cc7720a..ab21be0bc 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/7fbd55f9899d0e8ec17ee56f7835885278bd2005 + 7fbd55f9899d0e8ec17ee56f7835885278bd2005 Bluetooth: Add VID/PID 0489/e0e4 for MediaTek MT7922 + "https://gitlab.com/cki-project/kernel-ark/-/commit"/c707ce93be6a6f4524cf88e3f18e0437d7bd2b14 c707ce93be6a6f4524cf88e3f18e0437d7bd2b14 usb: typec: ucsi: Fix command cancellation diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 8925a8f7b..cce3b4c54 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2595,7 +2595,7 @@ CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA186=y @@ -6199,7 +6199,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index abf0dd560..a10e9d15c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2015,7 +2015,7 @@ CONFIG_GPIO_PL061=y # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 66ef3b8e2..f06aaed21 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2578,7 +2578,7 @@ CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA186=y @@ -6172,7 +6172,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index c9f2221c1..775cf4c3f 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1999,7 +1999,7 @@ CONFIG_GPIO_PL061=y # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 3e40544d3..84c41c8ae 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2574,7 +2574,7 @@ CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y @@ -6168,7 +6168,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index a93dc0279..75948e099 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2558,7 +2558,7 @@ CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y @@ -6143,7 +6143,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 010166c39..fce318e4e 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2526,7 +2526,7 @@ CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y @@ -6001,7 +6001,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index dcd7ea8ca..7f409af6e 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2510,7 +2510,7 @@ CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y @@ -5976,7 +5976,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DTPM=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 16249cb4a..8d21f137a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2059,7 +2059,7 @@ CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_TPIC2810 is not set # CONFIG_GPIO_TS4900 is not set @@ -5115,7 +5115,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROMFS_BACKED_BY_BLOCK=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 5b32ac23a..7fe8a5ace 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1817,7 +1817,7 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index ed58b17d0..16f1e0920 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2040,7 +2040,7 @@ CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_TPIC2810 is not set # CONFIG_GPIO_TS4900 is not set @@ -5086,7 +5086,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROMFS_BACKED_BY_BLOCK=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d2a6dbe6b..dd577ff63 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1801,7 +1801,7 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index f3c66b0f3..bfb85f6c2 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2056,7 +2056,7 @@ CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_TPIC2810 is not set # CONFIG_GPIO_TS4900 is not set @@ -5047,7 +5047,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROMFS_BACKED_BY_BLOCK=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 688ddf79f..80e5a41e6 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1819,7 +1819,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 66e1c696e..49a656aa6 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2037,7 +2037,7 @@ CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_TPIC2810 is not set # CONFIG_GPIO_TS4900 is not set @@ -5018,7 +5018,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROMFS_BACKED_BY_BLOCK=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 077aa2cfe..21b619953 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1803,7 +1803,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e8f121d45..5298bc644 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1812,7 +1812,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 22981d425..d11fb5d3f 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2238,7 +2238,7 @@ CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_TPIC2810 is not set CONFIG_GPIO_TPS68470=m @@ -5465,7 +5465,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROMFS_BACKED_BY_BLOCK=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 2062567a0..f2b67dc4f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1929,7 +1929,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 2b7a6ca4c..fed76593f 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2219,7 +2219,7 @@ CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_TPIC2810 is not set CONFIG_GPIO_TPS68470=m @@ -5437,7 +5437,7 @@ CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m -# CONFIG_RMNET is not set +CONFIG_RMNET=m # CONFIG_ROCKCHIP_PHY is not set CONFIG_ROCKER=m CONFIG_ROMFS_BACKED_BY_BLOCK=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index b668bf32c..5ee29c915 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1913,7 +1913,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SIFIVE is not set -# CONFIG_GPIO_SIM is not set +CONFIG_GPIO_SIM=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set diff --git a/kernel.spec b/kernel.spec index 4de669e7e..bfd095caf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -142,18 +142,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.3.8 -%define specversion 6.3.8 +%define specrpmversion 6.3.9 +%define specversion 6.3.9 %define patchversion 6.3 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.3.8 +%define tarfile_release 6.3.9 # This is needed to do merge window version magic %define patchlevel 3 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.3.8 +%define kabiversion 6.3.9 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3406,6 +3406,13 @@ fi # # %changelog +* Wed Jun 21 2023 Augusto Caringi [6.3.9-0] +- Turn on CONFIG_RMNET for Fedora (Justin M. Forbes) +- redhat/config: common: Enable CONFIG_GPIO_SIM for software development (Kate Hsuan) +- Add the MT7922 Bluetooth bug to BugsFixed (Augusto Caringi) +- Bluetooth: Add VID/PID 0489/e0e4 for MediaTek MT7922 (Meng Tang) +- Linux v6.3.9 + * Wed Jun 14 2023 Augusto Caringi [6.3.8-0] - usb: typec: ucsi: Fix command cancellation (Heikki Krogerus) - Add a CVE to BugsFixed (Justin M. Forbes) diff --git a/patch-6.3-redhat.patch b/patch-6.3-redhat.patch index 457b5862d..4aae9ef5b 100644 --- a/patch-6.3-redhat.patch +++ b/patch-6.3-redhat.patch @@ -9,6 +9,7 @@ drivers/acpi/irq.c | 17 ++- drivers/acpi/scan.c | 9 ++ drivers/ata/libahci.c | 18 +++ + drivers/bluetooth/btusb.c | 3 + drivers/char/ipmi/ipmi_dmi.c | 15 +++ drivers/char/ipmi/ipmi_msghandler.c | 16 ++- drivers/firmware/efi/Makefile | 1 + @@ -24,7 +25,6 @@ drivers/nvme/host/nvme.h | 4 + drivers/pci/quirks.c | 24 ++++ drivers/usb/core/hub.c | 7 ++ - drivers/usb/typec/ucsi/ucsi.c | 11 +- include/linux/efi.h | 22 ++-- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -37,10 +37,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + sound/pci/hda/patch_realtek.c | 2 + - 39 files changed, 516 insertions(+), 191 deletions(-) + 39 files changed, 512 insertions(+), 187 deletions(-) diff --git a/Makefile b/Makefile -index b4267d7a57b3..94fab2bcc83d 100644 +index f8ee72375885..8f848f64ad80 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -296,6 +296,20 @@ index 8f216de76648..51337c993a16 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); +diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c +index 0923582299f3..e88dd1a937a3 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -615,6 +615,9 @@ static const struct usb_device_id blacklist_table[] = { + { USB_DEVICE(0x0489, 0xe0e2), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH | + BTUSB_VALID_LE_STATES }, ++ { USB_DEVICE(0x0489, 0xe0e4), .driver_info = BTUSB_MEDIATEK | ++ BTUSB_WIDEBAND_SPEECH | ++ BTUSB_VALID_LE_STATES }, + { USB_DEVICE(0x0489, 0xe0f2), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH | + BTUSB_VALID_LE_STATES }, diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index bbf7029e224b..cf7faa970dd6 100644 --- a/drivers/char/ipmi/ipmi_dmi.c @@ -1116,7 +1130,7 @@ index a2d4f59e0535..1c5092b995e9 100644 { } diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index f4e2a88729fd..d3ba2beeb4d6 100644 +index c525867760bf..549083cdf0ec 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4309,6 +4309,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1168,35 +1182,6 @@ index 97a0f8faea6e..d837548d2024 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); -diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c -index 8d1baf28df55..8ada8e969f79 100644 ---- a/drivers/usb/typec/ucsi/ucsi.c -+++ b/drivers/usb/typec/ucsi/ucsi.c -@@ -132,10 +132,8 @@ static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd) - if (ret) - return ret; - -- if (cci & UCSI_CCI_BUSY) { -- ucsi->ops->async_write(ucsi, UCSI_CANCEL, NULL, 0); -- return -EBUSY; -- } -+ if (cmd != UCSI_CANCEL && cci & UCSI_CCI_BUSY) -+ return ucsi_exec_command(ucsi, UCSI_CANCEL); - - if (!(cci & UCSI_CCI_COMMAND_COMPLETE)) - return -EIO; -@@ -149,6 +147,11 @@ static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd) - return ucsi_read_error(ucsi); - } - -+ if (cmd == UCSI_CANCEL && cci & UCSI_CCI_CANCEL_COMPLETE) { -+ ret = ucsi_acknowledge_command(ucsi); -+ return ret ? ret : -EBUSY; -+ } -+ - return UCSI_CCI_LENGTH(cci); - } - diff --git a/include/linux/efi.h b/include/linux/efi.h index 7aa62c92185f..2da17f5aeef9 100644 --- a/include/linux/efi.h @@ -1444,7 +1429,7 @@ index cf6cc576736f..3653a4f35265 100644 int security_perf_event_open(struct perf_event_attr *attr, int type) { diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 48a0e87136f1..973fe458d1be 100644 +index 920e44ba998a..921398590e3f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9733,6 +9733,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { diff --git a/sources b/sources index f6e24d992..b571c410c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.3.8.tar.xz) = 11c32ab52e6390d6d4035f19f3ebb605487ccf7e160f1f61d699baae3bf8ade7fb173f6ab7460d5b543c6be82b85c5569b64d3d5c72299ef3262a65c14d847b8 -SHA512 (kernel-abi-stablelists-6.3.8.tar.bz2) = ca9fc8b759e365c7c4c767f1009ee3e82e356a00a8940464fd1530acdee555b4de18dcc58972df9d1305ddedd78b9d3449210971e96a11905d821cb6d71717e6 -SHA512 (kernel-kabi-dw-6.3.8.tar.bz2) = 30f4ea5bb5194580dfa55540cdcd2d596c943572d258fbf791c6c1a1fb720a3c0aa48617aa09719c7c2514c88cde67a7205981fa28d76a8d27dc172ea8b5865f +SHA512 (linux-6.3.9.tar.xz) = 5a121b928a0f730afc0560bc279841cf854b77bc93dd86066b6a2ec2fff934f5d4d2cb167af0e1a079d9228e086de7ac85796454429356946ae0bc98b646ecfe +SHA512 (kernel-abi-stablelists-6.3.9.tar.bz2) = 856b626aa04c96f94339b8721511b224648a17a37b943820374366ecf4a07567f0decec87ec99d77657c5f4354a3b23776d875921a5382b35f1483f8064eaee0 +SHA512 (kernel-kabi-dw-6.3.9.tar.bz2) = 8de52912f14198ab1887ca62b2809faf116e708edde7a465024bebb7bbd688bdd99f528bb8af659fa33a9444d2660e64c86a2574ef077a1de1ed0f6215de969a