aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeontx
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-06-23 10:08:52 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-26 12:49:15 +0200
commite6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f (patch)
treeb968bcd6eea432b9ac214f6259401f85fdf136a7 /target/linux/octeontx
parent7ddee03808f3f56735bf2a14bfde59a13110a4b3 (diff)
downloadupstream-e6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f.tar.gz
upstream-e6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f.tar.bz2
upstream-e6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f.zip
kernel: bump 5.4 to 5.4.128
Removed upstreamed: mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.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-.patch2
1 files changed, 1 insertions, 1 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 e33a28e953..c19e4cf90d 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
@@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
#include <linux/platform_data/x86/apple.h>
#include <linux/pm_runtime.h>
#include <linux/switchtec.h>
-@@ -5625,3 +5626,34 @@ static void apex_pci_fixup_class(struct
+@@ -5714,3 +5715,34 @@ static void apex_pci_fixup_class(struct
}
DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);