kernel: bump 4.14 to 4.14.97

Refreshed all patches.

Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte 2019-01-31 16:38:20 +01:00
parent 21762fe9d6
commit ef17edae3d
7 changed files with 14 additions and 14 deletions

View File

@ -3,10 +3,10 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .154 LINUX_VERSION-4.9 = .154
LINUX_VERSION-4.14 = .96 LINUX_VERSION-4.14 = .97
LINUX_KERNEL_HASH-4.9.154 = 5b314f1ac16f78e10acea0053f0c758e696b28f80272064e0a06bc69dc9d5696 LINUX_KERNEL_HASH-4.9.154 = 5b314f1ac16f78e10acea0053f0c758e696b28f80272064e0a06bc69dc9d5696
LINUX_KERNEL_HASH-4.14.96 = 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5 LINUX_KERNEL_HASH-4.14.97 = 8dd2c831ddabfc6241ddca946e600376785fd6f225a24655bc36a0c6b4e945f4
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)))))))

View File

@ -13,11 +13,11 @@ 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
@@ -429,6 +429,7 @@ config MMC_SDHCI_MSM @@ -310,6 +310,7 @@ config MMC_SDHCI_BCM_KONA
tristate "Qualcomm SDHCI Controller Support" tristate "SDHCI support on Broadcom KONA platform"
depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on ARCH_BCM_MOBILE
depends on MMC_SDHCI_PLTFM depends on MMC_SDHCI_PLTFM
+ select MMC_SDHCI_IO_ACCESSORS + select MMC_SDHCI_IO_ACCESSORS
help help
This selects the Secure Digital Host Controller Interface (SDHCI) This selects the Broadcom Kona Secure Digital Host Controller
support present in Qualcomm SOCs. The controller supports Interface(SDHCI) support.

View File

@ -339,7 +339,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/ipv4/fib_trie.c --- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c
@@ -2731,10 +2731,12 @@ static const struct file_operations fib_ @@ -2740,10 +2740,12 @@ static const struct file_operations fib_
int __net_init fib_proc_init(struct net *net) int __net_init fib_proc_init(struct net *net)
{ {
@ -354,7 +354,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
&fib_triestat_fops)) &fib_triestat_fops))
goto out2; goto out2;
@@ -2744,17 +2746,21 @@ int __net_init fib_proc_init(struct net @@ -2753,17 +2755,21 @@ int __net_init fib_proc_init(struct net
return 0; return 0;
out3: out3:

View File

@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/netns/generic.h> #include <net/netns/generic.h>
@@ -977,8 +982,36 @@ static int pppoe_xmit(struct ppp_channel @@ -978,8 +983,36 @@ static int pppoe_xmit(struct ppp_channel
return __pppoe_xmit(sk, skb); return __pppoe_xmit(sk, skb);
} }

View File

@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static void rt_fibinfo_free(struct rtable __rcu **rtp) static void rt_fibinfo_free(struct rtable __rcu **rtp)
--- a/net/ipv4/fib_trie.c --- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c
@@ -2460,6 +2460,7 @@ static const char *const rtn_type_names[ @@ -2469,6 +2469,7 @@ static const char *const rtn_type_names[
[RTN_THROW] = "THROW", [RTN_THROW] = "THROW",
[RTN_NAT] = "NAT", [RTN_NAT] = "NAT",
[RTN_XRESOLVE] = "XRESOLVE", [RTN_XRESOLVE] = "XRESOLVE",

View File

@ -229,7 +229,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mtk->num_phys = of_count_phandle_with_args(node, mtk->num_phys = of_count_phandle_with_args(node,
"phys", "#phy-cells"); "phys", "#phy-cells");
@@ -780,7 +723,7 @@ static int __maybe_unused xhci_mtk_suspe @@ -782,7 +725,7 @@ static int __maybe_unused xhci_mtk_suspe
xhci_mtk_host_disable(mtk); xhci_mtk_host_disable(mtk);
xhci_mtk_phy_power_off(mtk); xhci_mtk_phy_power_off(mtk);
xhci_mtk_clks_disable(mtk); xhci_mtk_clks_disable(mtk);
@ -238,7 +238,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
return 0; return 0;
} }
@@ -790,7 +733,7 @@ static int __maybe_unused xhci_mtk_resum @@ -792,7 +735,7 @@ static int __maybe_unused xhci_mtk_resum
struct usb_hcd *hcd = mtk->hcd; struct usb_hcd *hcd = mtk->hcd;
struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_hcd *xhci = hcd_to_xhci(hcd);

View File

@ -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
@@ -900,3 +900,5 @@ config MMC_SDHCI_XENON @@ -901,3 +901,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.