diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-05 01:06:28 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-06 17:57:39 +0200 |
| commit | ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b (patch) | |
| tree | e3f91606873495ec492602ef6ec636243391654e /target/linux/cns3xxx/patches-4.14 | |
| parent | 1153773c78d39d518b592f7b77180f370bcd4a60 (diff) | |
| download | upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.gz upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.bz2 upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.zip | |
kernel: bump 4.14 to 4.14.235
Manually rebased
ramips/patches-5.4/0048-asoc-add-mt7620-support.patch
All others updated automatically.
Compile-tested on: ath79/generic, ramips/mt7621
Runtime-tested on: ath79/generic
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/cns3xxx/patches-4.14')
| -rw-r--r-- | target/linux/cns3xxx/patches-4.14/075-spi_support.patch | 2 | ||||
| -rw-r--r-- | target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch index 61d9707491..f34a532be0 100644 --- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch +++ b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch @@ -26,7 +26,7 @@ obj-$(CONFIG_SPI_DLN2) += spi-dln2.o --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h -@@ -818,6 +818,10 @@ struct spi_transfer { +@@ -821,6 +821,10 @@ struct spi_transfer { u32 speed_hz; struct list_head transfer_list; diff --git a/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch b/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch index 56f43295b4..43ad7993f9 100644 --- a/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch +++ b/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch @@ -1,6 +1,6 @@ --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -2330,7 +2330,8 @@ static void pcie_write_mrrs(struct pci_d +@@ -2331,7 +2331,8 @@ static void pcie_write_mrrs(struct pci_d /* In the "safe" case, do not configure the MRRS. There appear to be * issues with setting MRRS to 0 on a number of devices. */ |