kernel: bump 4.14 to 4.14.134
Refreshed all patches. Remove upstreamed: - 049-v4.20-mips-remove-superfluous-check-for-linux.patch Fixes: - CVE-2019-3846 - CVE-2019-3900 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		| @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL | |||||||
|   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) |   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) | ||||||
| endif | endif | ||||||
|  |  | ||||||
| LINUX_VERSION-4.14 = .133 | LINUX_VERSION-4.14 = .134 | ||||||
|  |  | ||||||
| LINUX_KERNEL_HASH-4.14.133 = be9844e534d28db51a81672cdeb8e430a47f4c91379c06cd431f0b8a1c79b700 | LINUX_KERNEL_HASH-4.14.134 = 0b21e7b5effd92303a551b5be2380c9703d6fb87cfe5189fe0d795cc73903d2d | ||||||
|  |  | ||||||
| remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) | remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) | ||||||
| sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) | sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> | |||||||
|  |  | ||||||
| --- a/drivers/net/can/spi/mcp251x.c | --- a/drivers/net/can/spi/mcp251x.c | ||||||
| +++ b/drivers/net/can/spi/mcp251x.c | +++ b/drivers/net/can/spi/mcp251x.c | ||||||
| @@ -952,6 +952,9 @@ static int mcp251x_open(struct net_devic | @@ -951,6 +951,9 @@ static int mcp251x_open(struct net_devic | ||||||
|  	priv->tx_skb = NULL; |  	priv->tx_skb = NULL; | ||||||
|  	priv->tx_len = 0; |  	priv->tx_len = 0; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> | |||||||
|  |  | ||||||
| --- a/drivers/usb/gadget/function/u_ether.c | --- a/drivers/usb/gadget/function/u_ether.c | ||||||
| +++ b/drivers/usb/gadget/function/u_ether.c | +++ b/drivers/usb/gadget/function/u_ether.c | ||||||
| @@ -848,6 +848,10 @@ struct net_device *gether_setup_name_def | @@ -850,6 +850,10 @@ struct net_device *gether_setup_name_def | ||||||
|  	net->ethtool_ops = &ops; |  	net->ethtool_ops = &ops; | ||||||
|  	SET_NETDEV_DEVTYPE(net, &gadget_type); |  	SET_NETDEV_DEVTYPE(net, &gadget_type); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org> | |||||||
|  |  | ||||||
| --- a/drivers/usb/serial/option.c | --- a/drivers/usb/serial/option.c | ||||||
| +++ b/drivers/usb/serial/option.c | +++ b/drivers/usb/serial/option.c | ||||||
| @@ -1947,7 +1947,8 @@ static const struct usb_device_id option | @@ -1948,7 +1948,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, 0x7d01, 0xff) },			/* D-Link DWM-156 (variant) */ | ||||||
|  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, |  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, | ||||||
|  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, |  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, | ||||||
|   | |||||||
| @@ -1,47 +0,0 @@ | |||||||
| From 1287533d3d95d5ad8b02773733044500b1be06bc Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Sean Young <sean@mess.org> |  | ||||||
| Date: Fri, 16 Nov 2018 16:09:39 +0000 |  | ||||||
| Subject: MIPS: Remove superfluous check for __linux__ |  | ||||||
|  |  | ||||||
| When building BPF code using "clang -target bpf -c", clang does not |  | ||||||
| define __linux__. |  | ||||||
|  |  | ||||||
| To build BPF IR decoders the include linux/lirc.h is needed which |  | ||||||
| includes linux/types.h. Currently this workaround is needed: |  | ||||||
|  |  | ||||||
| https://git.linuxtv.org/v4l-utils.git/commit/?id=dd3ff81f58c4e1e6f33765dc61ad33c48ae6bb07 |  | ||||||
|  |  | ||||||
| This check might otherwise be useful to stop users from using a non-linux |  | ||||||
| compiler, but if you're doing that you are going to have a lot more |  | ||||||
| trouble anyway. |  | ||||||
|  |  | ||||||
| Signed-off-by: Sean Young <sean@mess.org> |  | ||||||
| Signed-off-by: Paul Burton <paul.burton@mips.com> |  | ||||||
| Patchwork: https://patchwork.linux-mips.org/patch/21149/ |  | ||||||
| Cc: Ralf Baechle <ralf@linux-mips.org> |  | ||||||
| Cc: James Hogan <jhogan@kernel.org> |  | ||||||
| Cc: linux-mips@linux-mips.org |  | ||||||
| Cc: linux-kernel@vger.kernel.org |  | ||||||
| --- |  | ||||||
|  arch/mips/include/uapi/asm/sgidefs.h | 8 -------- |  | ||||||
|  1 file changed, 8 deletions(-) |  | ||||||
|  |  | ||||||
| (limited to 'arch/mips/include/uapi/asm/sgidefs.h') |  | ||||||
|  |  | ||||||
| --- a/arch/mips/include/uapi/asm/sgidefs.h |  | ||||||
| +++ b/arch/mips/include/uapi/asm/sgidefs.h |  | ||||||
| @@ -12,14 +12,6 @@ |  | ||||||
|  #define __ASM_SGIDEFS_H |  | ||||||
|   |  | ||||||
|  /* |  | ||||||
| - * Using a Linux compiler for building Linux seems logic but not to |  | ||||||
| - * everybody. |  | ||||||
| - */ |  | ||||||
| -#ifndef __linux__ |  | ||||||
| -#error Use a Linux compiler or give up. |  | ||||||
| -#endif |  | ||||||
| - |  | ||||||
| -/* |  | ||||||
|   * Definitions for the ISA levels |  | ||||||
|   * |  | ||||||
|   * With the introduction of MIPS32 / MIPS64 instruction sets definitions |  | ||||||
		Reference in New Issue
	
	Block a user
	 Koen Vandeputte
					Koen Vandeputte