diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-31 16:06:24 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-31 16:06:24 +0200 |
| commit | 96dd0aced0793e30b58b2469e2958aaf5e8deceb (patch) | |
| tree | d91d1564187e8138c917e09bc438bde3f0c5df82 | |
| parent | 172e0106d5aaaa93a137ad8e4fd88f6f54d06315 (diff) | |
| parent | f37407f6c09c03c9dd8bcbaf219193f2d1e440f5 (diff) | |
| download | kernel-96dd0aced0793e30b58b2469e2958aaf5e8deceb.tar.gz kernel-96dd0aced0793e30b58b2469e2958aaf5e8deceb.tar.xz kernel-96dd0aced0793e30b58b2469e2958aaf5e8deceb.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 15 | ||||
| -rw-r--r-- | patch-5.13-redhat.patch | 8 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 21 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 0cc9ce77a..43e742598 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2891,7 +2891,20 @@ fi # # %changelog -* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.6-200] +* Sat Jul 31 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.7-200] +- kernel-5.13.7-0 (Justin M. Forbes) +- 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) + +* Sat Jul 31 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.7-0] - 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) diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch index 9f9fc2d42..49adbfa8e 100644 --- a/patch-5.13-redhat.patch +++ b/patch-5.13-redhat.patch @@ -90,7 +90,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index 96967f895193..dccbf438edf2 100644 +index 614327400aea..15c6acda836e 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1404,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 fb1c5ae0da39..b7cf30213ac2 100644 +index d963f25fc7ae..66455e2261d0 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c -@@ -2830,32 +2830,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) +@@ -2880,32 +2880,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) return 0; } @@ -1440,7 +1440,7 @@ index fb1c5ae0da39..b7cf30213ac2 100644 static void nvme_async_probe(void *data, async_cookie_t cookie) { struct nvme_dev *dev = data; -@@ -2905,7 +2879,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) +@@ -2955,7 +2929,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) quirks |= check_vendor_combination_bug(pdev); @@ -1,3 +1,3 @@ -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 +SHA512 (linux-5.13.7.tar.xz) = 63e05770b3a9287c1e6f855c34e37c5ce50dfb42b42c500f647e4860e92bd89697ce571e57377b00dbf954e854259e3e9fd1dddfc4b0fb9eb88f5bd04fa9a487 +SHA512 (kernel-abi-whitelists-5.13.7-200.tar.bz2) = e232c6363eea823953aff68ec106e8c174237e5111d66f55139325df68fff1a503eb178d8468c921bf631a9cb380b55d205b344a63c07694940ecec205e6fb55 +SHA512 (kernel-kabi-dw-5.13.7-200.tar.bz2) = 796acd53da0cb495d9d7701d0cbb1edb6431a87d07e8fade2105babdaa74aa99111dc4f342fa19c14d07a1b8fc8b360aa5e07739a5c144387eebc63582d44300 |