summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2021-03-08 09:59:46 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2021-03-10 13:55:56 +0100
commit34023344134a3abedcb892675bb2d75ec7b104b2 (patch)
treea3ddf3f4d725372b7505e670963311cb055d32f7 /target
parent55e9d87754ee79c29e53868d01bd6974d16365c5 (diff)
downloadopenwrt-34023344134a3abedcb892675bb2d75ec7b104b2.tar.gz
openwrt-34023344134a3abedcb892675bb2d75ec7b104b2.tar.bz2
openwrt-34023344134a3abedcb892675bb2d75ec7b104b2.zip
kernel: bump 4.14 to 4.14.224
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Compile-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch4
-rw-r--r--target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch2
-rw-r--r--target/linux/x86/patches-4.14/200-pcengines-apu2-reboot.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch b/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch
index 6237177a45..483881f35d 100644
--- a/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch
+++ b/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch
@@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int br_add_bridge(struct net *net, const char *name);
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
-@@ -174,6 +174,7 @@ BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
+@@ -177,6 +177,7 @@ BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);
BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
@@ -125,7 +125,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
-@@ -223,6 +224,7 @@ static const struct brport_attribute *br
+@@ -226,6 +227,7 @@ static const struct brport_attribute *br
&brport_attr_proxyarp_wifi,
&brport_attr_multicast_flood,
&brport_attr_broadcast_flood,
diff --git a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
index 7ed1a616f6..77ec3f111c 100644
--- a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2749,6 +2749,18 @@ static const struct usb_device_id uvc_id
+@@ -2752,6 +2752,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_QUIRK_FORCE_Y8 },
diff --git a/target/linux/x86/patches-4.14/200-pcengines-apu2-reboot.patch b/target/linux/x86/patches-4.14/200-pcengines-apu2-reboot.patch
index bc57806c74..742b6d6ad5 100644
--- a/target/linux/x86/patches-4.14/200-pcengines-apu2-reboot.patch
+++ b/target/linux/x86/patches-4.14/200-pcengines-apu2-reboot.patch
@@ -1,6 +1,6 @@
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -477,6 +477,16 @@ static const struct dmi_system_id reboot
+@@ -486,6 +486,16 @@ static const struct dmi_system_id reboot
},
},