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/generic/backport-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/generic/backport-5.4')
| -rw-r--r-- | target/linux/generic/backport-5.4/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch | 6 | ||||
| -rw-r--r-- | target/linux/generic/backport-5.4/826-v5.8-spi-rb4xx-update-driver-to-be-device-tree-aware.patch | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.4/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch b/target/linux/generic/backport-5.4/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch index 5d762c571c..71e26d50da 100644 --- a/target/linux/generic/backport-5.4/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch +++ b/target/linux/generic/backport-5.4/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch @@ -20,11 +20,9 @@ Signed-off-by: Christopher Hill <ch6574@gmail.com> drivers/spi/spi-rb4xx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/drivers/spi/spi-rb4xx.c b/drivers/spi/spi-rb4xx.c -index 4c9620e0d18c..17e1a77dc132 100644 --- a/drivers/spi/spi-rb4xx.c +++ b/drivers/spi/spi-rb4xx.c -@@ -158,6 +158,11 @@ static int rb4xx_spi_probe(struct platform_device *pdev) +@@ -158,6 +158,11 @@ static int rb4xx_spi_probe(struct platfo master->transfer_one = rb4xx_transfer_one; master->set_cs = rb4xx_set_cs; @@ -36,7 +34,7 @@ index 4c9620e0d18c..17e1a77dc132 100644 err = devm_spi_register_master(&pdev->dev, master); if (err) { dev_err(&pdev->dev, "failed to register SPI master\n"); -@@ -168,11 +173,6 @@ static int rb4xx_spi_probe(struct platform_device *pdev) +@@ -168,11 +173,6 @@ static int rb4xx_spi_probe(struct platfo if (err) return err; diff --git a/target/linux/generic/backport-5.4/826-v5.8-spi-rb4xx-update-driver-to-be-device-tree-aware.patch b/target/linux/generic/backport-5.4/826-v5.8-spi-rb4xx-update-driver-to-be-device-tree-aware.patch index 0340c934d8..0ce4f2bb35 100644 --- a/target/linux/generic/backport-5.4/826-v5.8-spi-rb4xx-update-driver-to-be-device-tree-aware.patch +++ b/target/linux/generic/backport-5.4/826-v5.8-spi-rb4xx-update-driver-to-be-device-tree-aware.patch @@ -21,8 +21,6 @@ Signed-off-by: Christopher Hill <ch6574@gmail.com> drivers/spi/spi-rb4xx.c | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/drivers/spi/spi-rb4xx.c b/drivers/spi/spi-rb4xx.c -index 17e1a77dc132..8aa51beb4ff3 100644 --- a/drivers/spi/spi-rb4xx.c +++ b/drivers/spi/spi-rb4xx.c @@ -14,6 +14,7 @@ @@ -33,7 +31,7 @@ index 17e1a77dc132..8aa51beb4ff3 100644 #include <asm/mach-ath79/ar71xx_regs.h> -@@ -150,6 +151,7 @@ static int rb4xx_spi_probe(struct platform_device *pdev) +@@ -150,6 +151,7 @@ static int rb4xx_spi_probe(struct platfo if (IS_ERR(ahb_clk)) return PTR_ERR(ahb_clk); @@ -41,7 +39,7 @@ index 17e1a77dc132..8aa51beb4ff3 100644 master->bus_num = 0; master->num_chipselect = 3; master->mode_bits = SPI_TX_DUAL; -@@ -188,11 +190,18 @@ static int rb4xx_spi_remove(struct platform_device *pdev) +@@ -188,11 +190,18 @@ static int rb4xx_spi_remove(struct platf return 0; } |