diff options
26 files changed, 51 insertions, 51 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 99cef4350..80a8482e5 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6842,6 +6842,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 0a295e4bc..428e16529 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5477,6 +5477,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index a45547433..57978267d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6817,6 +6817,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 39e4dee9e..bd1cab2d4 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5454,6 +5454,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index add46f7fa..e9036636a 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7009,6 +7009,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 68023721b..655328e4a 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6985,6 +6985,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 2703b8089..3961f2fc8 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6799,6 +6799,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 4c7e8f04a..012558183 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6775,6 +6775,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index e370a243b..429903a8d 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -6181,6 +6181,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 50e73dd37..6ca51ba6c 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -6157,6 +6157,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 851d132e9..4d7a1c7f3 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5794,6 +5794,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index be39d9730..72afe23a9 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5263,6 +5263,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f3ff4ffd8..cc644a0d4 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5769,6 +5769,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 20c2aea38..205873ec4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5244,6 +5244,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a7bfcde48..0dad1ea54 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5746,6 +5746,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index be11f9800..119d4ada2 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -5208,6 +5208,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 802205b38..98f7a252a 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5721,6 +5721,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 77011b2e5..dc43a49bb 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5189,6 +5189,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e0a95b6f3..59cc5ac63 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5217,6 +5217,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 190da0f7d..535fa8622 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6231,6 +6231,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b2952b6dc..6153e9f4f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5483,6 +5483,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8522e3c7c..bc8ff6bcd 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6207,6 +6207,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 84fee67ba..61a08dbc2 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5461,6 +5461,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel.spec b/kernel.spec index 2b33575f2..37da07ce5 100755 --- a/kernel.spec +++ b/kernel.spec @@ -116,7 +116,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.13 -%define rpmversion 5.13.5 +%define rpmversion 5.13.6 %define stableversion 5.13 %define pkgrelease 200 @@ -646,7 +646,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13.5.tar.xz +Source0: linux-5.13.6.tar.xz Source1: Makefile.rhelver @@ -1315,8 +1315,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13.5 -c -mv linux-5.13.5 linux-%{KVERREL} +%setup -q -n kernel-5.13.6 -c +mv linux-5.13.6 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2886,7 +2886,19 @@ fi # # %changelog -* Sun Jul 25 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.5-200] +* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.6-200] +- kernel-5.13.6-0 (Justin M. Forbes) +- kernel-5.13.5-0 (Justin M. Forbes) +- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes) +- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes) +- RHEL configs need this too (Justin M. Forbes) +- kernel-5.13.4-0 (Justin M. Forbes) +- Config update for 5.13.4 (Justin M. Forbes) +- kernel-5.13.3-0 (Justin M. Forbes) +- Don't tag a release as [redhat] (Justin M. Forbes) +- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang) + +* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.6-0] - kernel-5.13.5-0 (Justin M. Forbes) - iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes) - Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes) diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch index 292f7b74f..9f9fc2d42 100644 --- a/patch-5.13-redhat.patch +++ b/patch-5.13-redhat.patch @@ -32,7 +32,6 @@ drivers/platform/x86/amd-pmc.c | 248 +++++++++- drivers/scsi/smartpqi/smartpqi_init.c | 16 + drivers/usb/core/hub.c | 7 + - drivers/usb/host/xhci-pci-renesas.c | 16 +- include/linux/acpi.h | 5 + include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + @@ -66,7 +65,7 @@ tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- .../selftests/bpf/progs/test_static_linked1.c | 30 -- .../selftests/bpf/progs/test_static_linked2.c | 31 -- - 68 files changed, 917 insertions(+), 2361 deletions(-) + 67 files changed, 909 insertions(+), 2353 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -91,7 +90,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index 41be12f806e0..f89aa29cd5c2 100644 +index 96967f895193..dccbf438edf2 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -797,7 +796,7 @@ index 467e94259679..9b6f5b8e5397 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 4b7ee3fa9224..64b31d852d20 100644 +index 847f33ffc4ae..363037f8eaf8 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -1405,10 +1404,10 @@ index d94bd8d732e9..7775395bef6f 100644 IWL_DEV_INFO(0x02F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL), IWL_DEV_INFO(0x02F0, 0x6074, iwl_ax201_cfg_quz_hr, NULL), diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index 42ad75ff1348..5a72bdf5ad03 100644 +index fb1c5ae0da39..b7cf30213ac2 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c -@@ -2828,32 +2828,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) +@@ -2830,32 +2830,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) return 0; } @@ -1441,7 +1440,7 @@ index 42ad75ff1348..5a72bdf5ad03 100644 static void nvme_async_probe(void *data, async_cookie_t cookie) { struct nvme_dev *dev = data; -@@ -2903,7 +2877,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) +@@ -2905,7 +2879,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) quirks |= check_vendor_combination_bug(pdev); @@ -1917,10 +1916,10 @@ index 5db16509b6e1..5b8b5e3edd39 100644 PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_DELL, 0x1fe0) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index df8e69e60aaf..fb851c5130e1 100644 +index 4e123336e410..22d98f536d90 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5587,6 +5587,13 @@ static void hub_event(struct work_struct *work) +@@ -5635,6 +5635,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1934,40 +1933,6 @@ index df8e69e60aaf..fb851c5130e1 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/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c -index 431213cdf9e0..f97ac9f52bf4 100644 ---- a/drivers/usb/host/xhci-pci-renesas.c -+++ b/drivers/usb/host/xhci-pci-renesas.c -@@ -207,8 +207,7 @@ static int renesas_check_rom_state(struct pci_dev *pdev) - return 0; - - case RENESAS_ROM_STATUS_NO_RESULT: /* No result yet */ -- dev_dbg(&pdev->dev, "Unknown ROM status ...\n"); -- break; -+ return 0; - - case RENESAS_ROM_STATUS_ERROR: /* Error State */ - default: /* All other states are marked as "Reserved states" */ -@@ -225,12 +224,13 @@ static int renesas_fw_check_running(struct pci_dev *pdev) - u8 fw_state; - int err; - -- /* -- * Only if device has ROM and loaded FW we can skip loading and -- * return success. Otherwise (even unknown state), attempt to load FW. -- */ -- if (renesas_check_rom(pdev) && !renesas_check_rom_state(pdev)) -- return 0; -+ /* Check if device has ROM and loaded, if so skip everything */ -+ err = renesas_check_rom(pdev); -+ if (err) { /* we have rom */ -+ err = renesas_check_rom_state(pdev); -+ if (!err) -+ return err; -+ } - - /* - * Test if the device is actually needing the firmware. As most diff --git a/include/linux/acpi.h b/include/linux/acpi.h index c60745f657e9..dd0dafd21e33 100644 --- a/include/linux/acpi.h @@ -1,3 +1,3 @@ -SHA512 (linux-5.13.5.tar.xz) = 180fb334f713c8797dfe6c141a1c5709da5d9d31e9e46e8091ceb30e2d0482c662b936c6436d86da9af6c231ee4bca754ce1bb061391c337192909e2aa8b9129 -SHA512 (kernel-abi-whitelists-5.13.5-200.tar.bz2) = 228abb09206d35529cafbf0d4e13337df7a3b6d8b6b4bbfe4b8c4742d220b11bb1381b3865d5d2c0e920ed54f44aa29f3cc9fdeb59185e190c62cd158eeab7e2 -SHA512 (kernel-kabi-dw-5.13.5-200.tar.bz2) = 1b8308dde95ff38614ca4ee638e4382ab1b66136e8a0b02e84725fda01d7a9cbd399541aba0fbf8a82411abf52d6c962ec2aca07ac8d1add53e25c53d984ef3e +SHA512 (linux-5.13.6.tar.xz) = 1e2cd327165a6fda5348c60b99beab684531e9843f6e3acdedd35471855fb2d8e1425bb9f57899b7b69be2697dc8936c46fc5d5719caaa7d46300effa675dc7c +SHA512 (kernel-abi-whitelists-5.13.6-200.tar.bz2) = 994efa4b6d9e6a7994eacb71a5034d7663efa7972c9c64e3569dd4b203cdbcb476ea74f0678bcf565a1962549e7775cce62e83f9044f02b54520e09ef6bccf61 +SHA512 (kernel-kabi-dw-5.13.6-200.tar.bz2) = eba0499a6eefd5482cc5966455d617698b7f2103101ed596076f0f215e341cf0640d2dadf476cfbc436a8b8836dedc88493f890f6366cc31694d12d8a5bfe0bd |