diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-15 10:15:17 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-15 10:15:17 +0200 |
| commit | fa47c62524f9da02f1cc9bd29721ea4ad033e653 (patch) | |
| tree | 6f4f37593b2f25bfeb6bf182a598035fcfcc2b1a /patch-5.13-redhat.patch | |
| parent | 2d3420f079f5240e2a993fa62c25adbef81e9893 (diff) | |
| parent | 5802d5fcd606b6059f4eec120a49fc0a4605abba (diff) | |
| download | kernel-fa47c62524f9da02f1cc9bd29721ea4ad033e653.tar.gz kernel-fa47c62524f9da02f1cc9bd29721ea4ad033e653.tar.xz kernel-fa47c62524f9da02f1cc9bd29721ea4ad033e653.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.13-redhat.patch')
| -rw-r--r-- | patch-5.13-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch index cce8169a3..0591aa2a6 100644 --- a/patch-5.13-redhat.patch +++ b/patch-5.13-redhat.patch @@ -97,7 +97,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index d0ea05957da6..44022e6db235 100644 +index cbb2f35baedb..d3dc4ecbc462 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1505,7 +1505,7 @@ index d963f25fc7ae..66455e2261d0 100644 * Some systems use a bios work around to ask for D3 on * platforms that support kernel managed suspend. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index ab3de1551b50..7bc8ebb58d35 100644 +index 7b1c81b899cd..5904ece27f64 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4231,6 +4231,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, |