From e44e60b290fb346a4cdd5ca9b141abbcf61e80fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 9 Jun 2020 14:18:25 +0200 Subject: kernel: bump 5.4 to 5.4.48 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../826-v5.8-spi-rb4xx-update-driver-to-be-device-tree-aware.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/backport-5.4/826-v5.8-spi-rb4xx-update-driver-to-be-device-tree-aware.patch') 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 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 -@@ -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; } -- cgit v1.2.3