From 9bfc21a8d34ebfffe493a4b18c35c3255b5d3340 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 17 Aug 2021 19:38:52 +0800 Subject: [PATCH] kernel: bump to 4.9.280, 4.14.244, 4.19.204 Refreshed all patches. Signed-off-by: Tianling Shen --- include/kernel-version.mk | 12 ++++++------ ...-0059-Added-Device-IDs-for-August-DVB-T-205.patch | 2 +- ...ideobuf2-Allow-exporting-of-a-struct-dmabuf.patch | 4 ++-- ...erial-option-fix-dwm-158-3g-modem-interface.patch | 2 +- .../090-net-generalize-napi_complete_done.patch | 4 ++-- .../650-netfilter-add-xt_OFFLOAD-target.patch | 4 ++-- .../hack-4.14/998-usb-serial-option-add-u9300.patch | 2 +- .../hack-4.19/998-usb-serial-option-add-u9300.patch | 2 +- .../pending-4.14/601-add-kernel-imq-support.patch | 2 +- ...t-pppoe-support-hardware-flow-table-offload.patch | 2 +- .../pending-4.19/601-add-kernel-imq-support.patch | 2 +- ...t-pppoe-support-hardware-flow-table-offload.patch | 2 +- .../pending-4.9/601-add-kernel-imq-support.patch | 2 +- .../ixp4xx/patches-4.9/160-delayed_uart_io.patch | 10 +++++----- .../patches-4.19/0900-bt-mtk-serial-fix.patch | 2 +- ...net-usb-r8152-add-LED-configuration-from-OF.patch | 8 ++++---- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 862af46c01..07818622f4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .278 -LINUX_VERSION-4.14 = .242 -LINUX_VERSION-4.19 = .201 +LINUX_VERSION-4.9 = .280 +LINUX_VERSION-4.14 = .244 +LINUX_VERSION-4.19 = .204 -LINUX_KERNEL_HASH-4.9.278 = e73781c4d45488cc615ed0f4ed3b213bb571e42ff5f97b279643bdc5cc567e11 -LINUX_KERNEL_HASH-4.14.242 = 3e3d1c42a44d22e968a31a6136165b7d70ea703683ff669d5045e8891a4c1a5c -LINUX_KERNEL_HASH-4.19.201 = 8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0 +LINUX_KERNEL_HASH-4.9.280 = 43d9fcaff6854d083b8c940b436f18b7a158c10b7399f80b7344a220d3c3a92a +LINUX_KERNEL_HASH-4.14.244 = b6e0bfa171959aef36817e28f9010f5a949488db122a6ea7a4e8b8325923a574 +LINUX_KERNEL_HASH-4.19.204 = c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/bcm27xx/patches-4.19/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/bcm27xx/patches-4.19/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch index 409b289416..cf04f14566 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Added Device IDs for August DVB-T 205 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -@@ -1917,6 +1917,10 @@ static const struct usb_device_id rtl28x +@@ -1926,6 +1926,10 @@ static const struct usb_device_id rtl28x &rtl28xxu_props, "Compro VideoMate U650F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, &rtl28xxu_props, "MaxMedia HU394-T", NULL) }, diff --git a/target/linux/bcm27xx/patches-4.19/950-0243-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/bcm27xx/patches-4.19/950-0243-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch index fbaa3c2d40..ea5fa26755 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0243-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0243-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch @@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c -@@ -1851,12 +1851,12 @@ static int __find_plane_by_offset(struct +@@ -1862,12 +1862,12 @@ static int __find_plane_by_offset(struct return -EINVAL; } @@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson struct dma_buf *dbuf; if (q->memory != VB2_MEMORY_MMAP) { -@@ -1906,6 +1906,21 @@ int vb2_core_expbuf(struct vb2_queue *q, +@@ -1917,6 +1917,21 @@ int vb2_core_expbuf(struct vb2_queue *q, return -EINVAL; } diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch index 4ebcc115cd..7fc129bb9a 100644 --- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch +++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -2031,7 +2031,8 @@ static const struct usb_device_id option +@@ -2033,7 +2033,8 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index e6f2580c43..30567886a5 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -388,7 +388,7 @@ Signed-off-by: David S. Miller BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c -@@ -3240,7 +3240,7 @@ static int bnx2x_poll(struct napi_struct +@@ -3241,7 +3241,7 @@ static int bnx2x_poll(struct napi_struct * has been updated when NAPI was scheduled. */ if (IS_FCOE_FP(fp)) { @@ -863,7 +863,7 @@ Signed-off-by: David S. Miller return work_done; --- a/drivers/net/ethernet/natsemi/natsemi.c +++ b/drivers/net/ethernet/natsemi/natsemi.c -@@ -2261,7 +2261,7 @@ static int natsemi_poll(struct napi_stru +@@ -2258,7 +2258,7 @@ static int natsemi_poll(struct napi_stru np->intr_status = readl(ioaddr + IntrStatus); } while (np->intr_status); diff --git a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch index 7c93feccdc..01a9290242 100644 --- a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch +++ b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch @@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau help This option adds the flow table core infrastructure. -@@ -974,6 +973,15 @@ config NETFILTER_XT_TARGET_NOTRACK +@@ -986,6 +985,15 @@ config NETFILTER_XT_TARGET_NOTRACK depends on NETFILTER_ADVANCED select NETFILTER_XT_TARGET_CT @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau +obj-$(CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD) += xt_FLOWOFFLOAD.o obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o - obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o + obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o --- /dev/null +++ b/net/netfilter/xt_FLOWOFFLOAD.c @@ -0,0 +1,422 @@ diff --git a/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch index a03f3576d7..99bf37802b 100644 --- a/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1285,6 +1285,7 @@ static const struct usb_device_id produc +@@ -1351,6 +1351,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ diff --git a/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch index 6ed75e5ac1..c3d5840034 100644 --- a/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1296,6 +1296,7 @@ static const struct usb_device_id produc +@@ -1362,6 +1362,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ diff --git a/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch index 16f77d33f4..c1c20e903f 100644 --- a/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch @@ -1801,7 +1801,7 @@ /* Note : this field could be in headers_start/headers_end section * It is not yet because we do not want to have a 16 bit hole -@@ -3970,6 +4077,13 @@ void __init skb_init(void) +@@ -3973,6 +4080,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); diff --git a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch index 191cbcfb82..c7aa998517 100644 --- a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch @@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau #define PPP_VERSION "2.4.2" /* -@@ -1382,12 +1387,37 @@ static void ppp_dev_priv_destructor(stru +@@ -1393,12 +1398,37 @@ static void ppp_dev_priv_destructor(stru ppp_destroy_interface(ppp); } diff --git a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch index f1062b5894..520c7bd371 100644 --- a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch @@ -1466,7 +1466,7 @@ /* Note : this field could be in headers_start/headers_end section * It is not yet because we do not want to have a 16 bit hole -@@ -3996,6 +4073,13 @@ void __init skb_init(void) +@@ -3999,6 +4076,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); diff --git a/target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch index 89fa863aab..b4f060e6f9 100644 --- a/target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch @@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau #define PPP_VERSION "2.4.2" /* -@@ -1368,12 +1373,37 @@ static void ppp_dev_priv_destructor(stru +@@ -1379,12 +1384,37 @@ static void ppp_dev_priv_destructor(stru ppp_destroy_interface(ppp); } diff --git a/target/linux/generic/pending-4.9/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.9/601-add-kernel-imq-support.patch index 911e27046d..84a4682dcb 100644 --- a/target/linux/generic/pending-4.9/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.9/601-add-kernel-imq-support.patch @@ -1754,7 +1754,7 @@ /* Note : this field could be in headers_start/headers_end section * It is not yet because we do not want to have a 16 bit hole -@@ -3548,6 +3655,13 @@ void __init skb_init(void) +@@ -3551,6 +3658,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch index 9241f633f8..5c5e2cff86 100644 --- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch +++ b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch @@ -64,7 +64,7 @@ unsigned int custom_divisor; --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c -@@ -383,6 +383,20 @@ static unsigned int mem16_serial_in(stru +@@ -387,6 +387,20 @@ static unsigned int mem16_serial_in(stru return readw(p->membase + offset); } @@ -85,7 +85,7 @@ static void mem32_serial_out(struct uart_port *p, int offset, int value) { offset = offset << p->regshift; -@@ -455,6 +469,11 @@ static void set_io_from_upio(struct uart +@@ -459,6 +473,11 @@ static void set_io_from_upio(struct uart p->serial_out = mem32be_serial_out; break; @@ -97,7 +97,7 @@ #ifdef CONFIG_SERIAL_8250_RT288X case UPIO_AU: p->serial_in = au_serial_in; -@@ -482,6 +501,7 @@ serial_port_out_sync(struct uart_port *p +@@ -486,6 +505,7 @@ serial_port_out_sync(struct uart_port *p case UPIO_MEM16: case UPIO_MEM32: case UPIO_MEM32BE: @@ -105,7 +105,7 @@ case UPIO_AU: p->serial_out(p, offset, value); p->serial_in(p, UART_LCR); /* safe, no side-effects */ -@@ -2780,6 +2800,7 @@ static int serial8250_request_std_resour +@@ -2786,6 +2806,7 @@ static int serial8250_request_std_resour case UPIO_MEM32BE: case UPIO_MEM16: case UPIO_MEM: @@ -113,7 +113,7 @@ if (!port->mapbase) break; -@@ -2818,6 +2839,7 @@ static void serial8250_release_std_resou +@@ -2824,6 +2845,7 @@ static void serial8250_release_std_resou case UPIO_MEM32BE: case UPIO_MEM16: case UPIO_MEM: diff --git a/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch index d95f1dde65..a4918fa9f5 100644 --- a/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2680,6 +2680,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2686,6 +2686,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch index 54b70982c5..1d57624110 100644 --- a/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -3978,6 +3979,22 @@ static void rtl_tally_reset(struct r8152 +@@ -3979,6 +3980,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -4019,6 +4036,8 @@ static void r8152b_init(struct r8152 *tp +@@ -4020,6 +4037,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -4145,6 +4164,8 @@ static void r8153_init(struct r8152 *tp) +@@ -4146,6 +4165,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -4208,6 +4229,8 @@ static void r8153b_init(struct r8152 *tp +@@ -4209,6 +4230,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */