kernel: bump 4.14 to 4.14.96
Refreshed all patches. New symbol added: - CONFIG_CIFS_ALLOW_INSECURE_LEGACY Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		| @@ -2,11 +2,11 @@ | |||||||
|  |  | ||||||
| LINUX_RELEASE?=1 | LINUX_RELEASE?=1 | ||||||
|  |  | ||||||
| LINUX_VERSION-4.14 = .95 |  | ||||||
| LINUX_VERSION-4.9 = .153 | LINUX_VERSION-4.9 = .153 | ||||||
|  | LINUX_VERSION-4.14 = .96 | ||||||
|  |  | ||||||
| LINUX_KERNEL_HASH-4.14.95 = ce6729e3fca312520e3cb4f27993852dbb019d94c59c0b35cedab571f9cb58e4 |  | ||||||
| LINUX_KERNEL_HASH-4.9.153 = 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a | LINUX_KERNEL_HASH-4.9.153 = 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a | ||||||
|  | LINUX_KERNEL_HASH-4.14.96 = 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5 | ||||||
|  |  | ||||||
| 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))))))) | ||||||
|   | |||||||
| @@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org> | |||||||
|  	rwlock_t		sk_callback_lock; |  	rwlock_t		sk_callback_lock; | ||||||
| --- a/net/core/sock.c | --- a/net/core/sock.c | ||||||
| +++ b/net/core/sock.c | +++ b/net/core/sock.c | ||||||
| @@ -2742,6 +2742,7 @@ void sock_init_data(struct socket *sock, | @@ -2743,6 +2743,7 @@ void sock_init_data(struct socket *sock, | ||||||
|   |   | ||||||
|  	sk->sk_max_pacing_rate = ~0U; |  	sk->sk_max_pacing_rate = ~0U; | ||||||
|  	sk->sk_pacing_rate = ~0U; |  	sk->sk_pacing_rate = ~0U; | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c | --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c | ||||||
| +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c | +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c | ||||||
| @@ -834,6 +834,7 @@ static void clusterip_net_exit(struct ne | @@ -835,6 +835,7 @@ static void clusterip_net_exit(struct ne | ||||||
|  	cn->procdir = NULL; |  	cn->procdir = NULL; | ||||||
|  #endif |  #endif | ||||||
|  	nf_unregister_net_hook(net, &cip_arp_ops); |  	nf_unregister_net_hook(net, &cip_arp_ops); | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com> | |||||||
|  |  | ||||||
| --- a/drivers/mmc/host/Kconfig | --- a/drivers/mmc/host/Kconfig | ||||||
| +++ b/drivers/mmc/host/Kconfig | +++ b/drivers/mmc/host/Kconfig | ||||||
| @@ -420,6 +420,7 @@ config MMC_SDHCI_MSM | @@ -429,6 +429,7 @@ config MMC_SDHCI_MSM | ||||||
|  	tristate "Qualcomm SDHCI Controller Support" |  	tristate "Qualcomm SDHCI Controller Support" | ||||||
|  	depends on ARCH_QCOM || (ARM && COMPILE_TEST) |  	depends on ARCH_QCOM || (ARM && COMPILE_TEST) | ||||||
|  	depends on MMC_SDHCI_PLTFM |  	depends on MMC_SDHCI_PLTFM | ||||||
|   | |||||||
| @@ -763,6 +763,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y | |||||||
| # CONFIG_CICADA_PHY is not set | # CONFIG_CICADA_PHY is not set | ||||||
| # CONFIG_CIFS is not set | # CONFIG_CIFS is not set | ||||||
| # CONFIG_CIFS_ACL is not set | # CONFIG_CIFS_ACL is not set | ||||||
|  | CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y | ||||||
| # CONFIG_CIFS_DEBUG is not set | # CONFIG_CIFS_DEBUG is not set | ||||||
| # CONFIG_CIFS_DEBUG2 is not set | # CONFIG_CIFS_DEBUG2 is not set | ||||||
| # CONFIG_CIFS_FSCACHE is not set | # CONFIG_CIFS_FSCACHE is not set | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -1158,6 +1158,10 @@ config SYNC_R4K | @@ -1161,6 +1161,10 @@ config SYNC_R4K | ||||||
|  config MIPS_MACHINE |  config MIPS_MACHINE | ||||||
|  	def_bool n |  	def_bool n | ||||||
|   |   | ||||||
|   | |||||||
| @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) |  struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) | ||||||
|  { |  { | ||||||
|  	struct dst_entry *dst = __sk_dst_get(sk); |  	struct dst_entry *dst = __sk_dst_get(sk); | ||||||
| @@ -1595,9 +1607,11 @@ void sk_destruct(struct sock *sk) | @@ -1596,9 +1608,11 @@ void sk_destruct(struct sock *sk) | ||||||
|   |   | ||||||
|  static void __sk_free(struct sock *sk) |  static void __sk_free(struct sock *sk) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -328,7 +328,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
| --- a/net/core/sock.c | --- a/net/core/sock.c | ||||||
| +++ b/net/core/sock.c | +++ b/net/core/sock.c | ||||||
| @@ -3381,6 +3381,8 @@ static __net_initdata struct pernet_oper | @@ -3382,6 +3382,8 @@ static __net_initdata struct pernet_oper | ||||||
|   |   | ||||||
|  static int __init proto_init(void) |  static int __init proto_init(void) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net> | |||||||
| --- | --- | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -1067,9 +1067,6 @@ config FW_ARC | @@ -1070,9 +1070,6 @@ config FW_ARC | ||||||
|  config ARCH_MAY_HAVE_PC_FDC |  config ARCH_MAY_HAVE_PC_FDC | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
| @@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net> | |||||||
|  config CEVT_BCM1480 |  config CEVT_BCM1480 | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
| @@ -2967,6 +2964,18 @@ choice | @@ -2970,6 +2967,18 @@ choice | ||||||
|  		bool "Extend builtin kernel arguments with bootloader arguments" |  		bool "Extend builtin kernel arguments with bootloader arguments" | ||||||
|  endchoice |  endchoice | ||||||
|   |   | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -2891,6 +2891,20 @@ config MIPS_O32_FP64_SUPPORT | @@ -2894,6 +2894,20 @@ config MIPS_O32_FP64_SUPPORT | ||||||
|   |   | ||||||
|  	  If unsure, say N. |  	  If unsure, say N. | ||||||
|   |   | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	select HAVE_PCSPKR_PLATFORM |  	select HAVE_PCSPKR_PLATFORM | ||||||
|  	select IRQ_MIPS_CPU |  	select IRQ_MIPS_CPU | ||||||
|  	select I8253 |  	select I8253 | ||||||
| @@ -1128,6 +1130,9 @@ config DMA_NONCOHERENT | @@ -1131,6 +1133,9 @@ config DMA_NONCOHERENT | ||||||
|  	bool |  	bool | ||||||
|  	select NEED_DMA_MAP_STATE |  	select NEED_DMA_MAP_STATE | ||||||
|   |   | ||||||
| @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  config NEED_DMA_MAP_STATE |  config NEED_DMA_MAP_STATE | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
| @@ -1652,6 +1657,7 @@ config CPU_R10000 | @@ -1655,6 +1660,7 @@ config CPU_R10000 | ||||||
|  	select CPU_SUPPORTS_64BIT_KERNEL |  	select CPU_SUPPORTS_64BIT_KERNEL | ||||||
|  	select CPU_SUPPORTS_HIGHMEM |  	select CPU_SUPPORTS_HIGHMEM | ||||||
|  	select CPU_SUPPORTS_HUGEPAGES |  	select CPU_SUPPORTS_HUGEPAGES | ||||||
| @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	help |  	help | ||||||
|  	  MIPS Technologies R10000-series processors. |  	  MIPS Technologies R10000-series processors. | ||||||
|   |   | ||||||
| @@ -1900,9 +1906,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 | @@ -1903,9 +1909,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
|  config SYS_HAS_CPU_MIPS32_R5 |  config SYS_HAS_CPU_MIPS32_R5 | ||||||
| @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
|  config SYS_HAS_CPU_MIPS64_R1 |  config SYS_HAS_CPU_MIPS64_R1 | ||||||
| @@ -1912,6 +1920,7 @@ config SYS_HAS_CPU_MIPS64_R2 | @@ -1915,6 +1923,7 @@ config SYS_HAS_CPU_MIPS64_R2 | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
|  config SYS_HAS_CPU_MIPS64_R6 |  config SYS_HAS_CPU_MIPS64_R6 | ||||||
|   | |||||||
| @@ -244,7 +244,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com> | |||||||
| +} | +} | ||||||
| --- a/fs/jffs2/super.c | --- a/fs/jffs2/super.c | ||||||
| +++ b/fs/jffs2/super.c | +++ b/fs/jffs2/super.c | ||||||
| @@ -370,14 +370,41 @@ static int __init init_jffs2_fs(void) | @@ -371,14 +371,41 @@ static int __init init_jffs2_fs(void) | ||||||
|  	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); |  	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); | ||||||
|  	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); |  	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -2324,6 +2324,12 @@ config MIPS_VPE_LOADER | @@ -2327,6 +2327,12 @@ config MIPS_VPE_LOADER | ||||||
|  	  Includes a loader for loading an elf relocatable object |  	  Includes a loader for loading an elf relocatable object | ||||||
|  	  onto another VPE and running it. |  	  onto another VPE and running it. | ||||||
|   |   | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> | |||||||
|  |  | ||||||
| --- a/drivers/mmc/host/Kconfig | --- a/drivers/mmc/host/Kconfig | ||||||
| +++ b/drivers/mmc/host/Kconfig | +++ b/drivers/mmc/host/Kconfig | ||||||
| @@ -899,3 +899,5 @@ config MMC_SDHCI_XENON | @@ -900,3 +900,5 @@ config MMC_SDHCI_XENON | ||||||
|  	  This selects Marvell Xenon eMMC/SD/SDIO SDHCI. |  	  This selects Marvell Xenon eMMC/SD/SDIO SDHCI. | ||||||
|  	  If you have a controller with this interface, say Y or M here. |  	  If you have a controller with this interface, say Y or M here. | ||||||
|  	  If unsure, say N. |  	  If unsure, say N. | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> | |||||||
|  |  | ||||||
| --- a/drivers/tty/serial/serial_core.c | --- a/drivers/tty/serial/serial_core.c | ||||||
| +++ b/drivers/tty/serial/serial_core.c | +++ b/drivers/tty/serial/serial_core.c | ||||||
| @@ -418,6 +418,9 @@ uart_get_baud_rate(struct uart_port *por | @@ -428,6 +428,9 @@ uart_get_baud_rate(struct uart_port *por | ||||||
|  		break; |  		break; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Koen Vandeputte
					Koen Vandeputte