diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-06-09 14:18:25 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-06-22 12:51:22 +0200 |
| commit | e44e60b290fb346a4cdd5ca9b141abbcf61e80fe (patch) | |
| tree | 7e46b387d0df829b07dbb13566b2f712a9279f48 /target/linux/octeontx/patches-5.4 | |
| parent | ceeece9ffaa5a3a336505332c39794d76c08b2ca (diff) | |
| download | upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.tar.gz upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.tar.bz2 upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.zip | |
kernel: bump 5.4 to 5.4.48
Resolved merge conflict in the following patches:
layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch
ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch
Refreshed patches, removed upstreamed patch:
bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch
Run tested: qemu-x86-64
Build tested: x86/64
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/octeontx/patches-5.4')
| -rw-r--r-- | target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch | 2 |
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 9784d88546..5308d3b286 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> -@@ -5564,3 +5565,34 @@ static void apex_pci_fixup_class(struct +@@ -5604,3 +5605,34 @@ static void apex_pci_fixup_class(struct } DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a, PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class); |