diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-04 13:17:37 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-04 18:10:13 +0100 |
| commit | 20b5a4ca01ca7b7c98dceb204e8b7b0a32f40cc9 (patch) | |
| tree | 6f38b827a846b30a05ccdedca9e856a3661dbdc5 /target/linux/mediatek | |
| parent | 1b310cff0f108cee59974f3c98dbd403da2960a0 (diff) | |
| download | upstream-20b5a4ca01ca7b7c98dceb204e8b7b0a32f40cc9.tar.gz upstream-20b5a4ca01ca7b7c98dceb204e8b7b0a32f40cc9.tar.bz2 upstream-20b5a4ca01ca7b7c98dceb204e8b7b0a32f40cc9.zip | |
kernel: bump 4.19 to 4.19.101
Refreshed all patches.
Fixes:
- CVE-2019-14896
- CVE-2019-14897
Remove upstreamed:
- 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch
- 950-0202-staging-bcm2835-camera-fix-module-autoloading.patch
- 001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mediatek')
| -rw-r--r-- | target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch | 11 | ||||
| -rw-r--r-- | target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch b/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch index 873dbed817..6c90222517 100644 --- a/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch +++ b/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch @@ -1,7 +1,6 @@ -diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c ---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2019-12-23 11:42:02.728620670 +0800 -+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2019-12-23 11:42:48.747289058 +0800 -@@ -999,11 +999,6 @@ +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -999,11 +999,6 @@ static int mtk_poll_rx(struct napi_struc if (!(trxd.rxd2 & RX_DMA_DONE)) break; @@ -13,7 +12,7 @@ diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/m mac = (trxd.rxd4 >> RX_DMA_FPORT_SHIFT) & RX_DMA_FPORT_MASK; /* From QDMA(5). This is a external interface case of HWNAT. -@@ -1017,7 +1012,7 @@ +@@ -1017,7 +1012,7 @@ static int mtk_poll_rx(struct napi_struc mac = 0; else mac--; @@ -22,7 +21,7 @@ diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/m if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT || !eth->netdev[mac])) goto release_desc; -@@ -2030,10 +2025,6 @@ +@@ -2030,10 +2025,6 @@ static int mtk_hw_init(struct mtk_eth *e /* Disable RX VLan Offloading */ mtk_w32(eth, 0, MTK_CDMP_EG_CTRL); diff --git a/target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch b/target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch index 8a3d68a405..b7251177f2 100644 --- a/target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch +++ b/target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch @@ -1,6 +1,5 @@ -diff -urN a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts ---- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2019-12-17 14:43:47.273940258 +0800 -+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2019-12-17 14:44:20.300945884 +0800 +--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts ++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -19,6 +19,7 @@ chosen { |