aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2021-08-19 21:30:01 +0200
committerDavid Bauer <mail@david-bauer.net>2021-08-20 01:01:13 +0200
commit9d082556fecfe2e971f964ebcd6b13fe30d208af (patch)
tree3d105faa315dd7715f1d0248c8af20e6181adacd /target/linux
parent7378c949270067d0a633cfd892b9dd6416581afa (diff)
downloadupstream-9d082556fecfe2e971f964ebcd6b13fe30d208af.tar.gz
upstream-9d082556fecfe2e971f964ebcd6b13fe30d208af.tar.bz2
upstream-9d082556fecfe2e971f964ebcd6b13fe30d208af.zip
kernel: bump to 4.14.244
Compile-tested: ath79-generic ipq40xx-generic Run-tested: ipq40xx-generic Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch2
-rw-r--r--target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch2
-rw-r--r--target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/brcm2708/patches-4.14/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch
index d394f77b48..1df8cf74ac 100644
--- a/target/linux/brcm2708/patches-4.14/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 059/454] 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/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 <johan@kernel.org>
--- 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/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 <nbd@nbd.name>
#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);
}