diff options
author | John Audia <graysky@archlinux.us> | 2021-07-19 05:17:10 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-25 13:52:38 +0200 |
commit | 5408e811b29643e3fd5f2cd227f17263daa45a74 (patch) | |
tree | c41b5db75482b8a16c092183206a60c13b2e1173 /target/linux/octeontx | |
parent | 2b2ac841e022054ff3390f25fa41336467530a91 (diff) | |
download | upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.gz upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.bz2 upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.zip |
kernel: bump 5.4 to 5.4.133
Manually rebased:
pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/octeontx')
-rw-r--r-- | target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch index c19e4cf90d..086fc0ab96 100644 --- a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch +++ b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch @@ -21,8 +21,8 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> +#include <linux/of.h> #include <linux/platform_data/x86/apple.h> #include <linux/pm_runtime.h> - #include <linux/switchtec.h> -@@ -5714,3 +5715,34 @@ static void apex_pci_fixup_class(struct + #include <linux/suspend.h> +@@ -5725,3 +5726,34 @@ static void apex_pci_fixup_class(struct } DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a, PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class); |