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-0451-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.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-0451-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0451-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0451-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch b/target/linux/bcm27xx/patches-5.4/950-0451-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch index 162a91c530..d968e93153 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0451-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0451-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch @@ -149,7 +149,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de> --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c -@@ -1057,8 +1057,8 @@ static int rc_dma_get_range(struct devic +@@ -1062,8 +1062,8 @@ static int rc_dma_get_range(struct devic */ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) { @@ -160,7 +160,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de> /* * If @dev is expected to be DMA-capable then the bus code that created -@@ -1085,19 +1085,13 @@ void iort_dma_setup(struct device *dev, +@@ -1090,19 +1090,13 @@ void iort_dma_setup(struct device *dev, } if (!ret) { |