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/bcm27xx/patches-5.4/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch | |
| 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/bcm27xx/patches-5.4/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch b/target/linux/bcm27xx/patches-5.4/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch index 3989b90fff..ef3c95e1ca 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch @@ -76,7 +76,7 @@ Subject: [PATCH] arm: partially revert --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S -@@ -335,6 +335,8 @@ ENTRY(\name\()_cache_fns) +@@ -336,6 +336,8 @@ ENTRY(\name\()_cache_fns) .long \name\()_flush_kern_dcache_area .long \name\()_dma_map_area .long \name\()_dma_unmap_area |