kernel: bump 4.14 to 4.14.99
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:
@@ -3,10 +3,10 @@
|
|||||||
LINUX_RELEASE?=1
|
LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-4.9 = .156
|
LINUX_VERSION-4.9 = .156
|
||||||
LINUX_VERSION-4.14 = .98
|
LINUX_VERSION-4.14 = .99
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-4.9.156 = 5eb1b9ba43370512ab637452089bb93f8c0fdd7d5399e99561d382f74517a816
|
LINUX_KERNEL_HASH-4.9.156 = 5eb1b9ba43370512ab637452089bb93f8c0fdd7d5399e99561d382f74517a816
|
||||||
LINUX_KERNEL_HASH-4.14.98 = 8f021171b1b1efb41326e603116a45126fc030d06aaa9b0784ae612323010c5f
|
LINUX_KERNEL_HASH-4.14.99 = 8ff98caed5b20b733dedcbe99559d71a0e09e239c0c2488b3fd799c96489eb0a
|
||||||
|
|
||||||
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)))))))
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|||||||
/* 32MB of flash */
|
/* 32MB of flash */
|
||||||
reg = <0x30000000 0x02000000>;
|
reg = <0x30000000 0x02000000>;
|
||||||
|
|
||||||
@@ -242,5 +292,16 @@
|
@@ -238,5 +288,16 @@
|
||||||
ata@63000000 {
|
ata@63000000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ the patch is only included in the series for context.
|
|||||||
|
|
||||||
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
||||||
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
||||||
@@ -303,5 +303,13 @@
|
@@ -299,5 +299,13 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
leds {
|
leds {
|
||||||
compatible = "gpio-leds";
|
compatible = "gpio-leds";
|
||||||
led-wps {
|
led-wps {
|
||||||
@@ -249,6 +255,47 @@
|
@@ -245,6 +251,47 @@
|
||||||
groups = "gpio1bgrp";
|
groups = "gpio1bgrp";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -290,6 +337,18 @@
|
@@ -286,6 +333,18 @@
|
||||||
<0x6000 0 0 4 &pci_intc 2>;
|
<0x6000 0 0 4 &pci_intc 2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
config MODULES_TREE_LOOKUP
|
config MODULES_TREE_LOOKUP
|
||||||
--- a/kernel/module.c
|
--- a/kernel/module.c
|
||||||
+++ b/kernel/module.c
|
+++ b/kernel/module.c
|
||||||
@@ -3006,9 +3006,11 @@ static struct module *setup_load_info(st
|
@@ -3008,9 +3008,11 @@ static struct module *setup_load_info(st
|
||||||
|
|
||||||
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
||||||
{
|
{
|
||||||
@@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
||||||
modmagic = NULL;
|
modmagic = NULL;
|
||||||
|
|
||||||
@@ -3029,6 +3031,7 @@ static int check_modinfo(struct module *
|
@@ -3031,6 +3033,7 @@ static int check_modinfo(struct module *
|
||||||
mod->name);
|
mod->name);
|
||||||
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
|
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
|
||||||
}
|
}
|
||||||
@@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/scripts/mod/modpost.c
|
--- a/scripts/mod/modpost.c
|
||||||
+++ b/scripts/mod/modpost.c
|
+++ b/scripts/mod/modpost.c
|
||||||
@@ -1982,7 +1982,9 @@ static void read_symbols(char *modname)
|
@@ -1984,7 +1984,9 @@ static void read_symbols(char *modname)
|
||||||
symname = remove_dot(info.strtab + sym->st_name);
|
symname = remove_dot(info.strtab + sym->st_name);
|
||||||
|
|
||||||
handle_modversions(mod, &info, sym, symname);
|
handle_modversions(mod, &info, sym, symname);
|
||||||
@@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
}
|
}
|
||||||
if (!is_vmlinux(modname) ||
|
if (!is_vmlinux(modname) ||
|
||||||
(is_vmlinux(modname) && vmlinux_section_warnings))
|
(is_vmlinux(modname) && vmlinux_section_warnings))
|
||||||
@@ -2143,8 +2145,10 @@ static void add_header(struct buffer *b,
|
@@ -2145,8 +2147,10 @@ static void add_header(struct buffer *b,
|
||||||
buf_printf(b, "#include <linux/vermagic.h>\n");
|
buf_printf(b, "#include <linux/vermagic.h>\n");
|
||||||
buf_printf(b, "#include <linux/compiler.h>\n");
|
buf_printf(b, "#include <linux/compiler.h>\n");
|
||||||
buf_printf(b, "\n");
|
buf_printf(b, "\n");
|
||||||
@@ -158,7 +158,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
buf_printf(b, "\n");
|
buf_printf(b, "\n");
|
||||||
buf_printf(b, "__visible struct module __this_module\n");
|
buf_printf(b, "__visible struct module __this_module\n");
|
||||||
buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
|
buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
|
||||||
@@ -2161,8 +2165,10 @@ static void add_header(struct buffer *b,
|
@@ -2163,8 +2167,10 @@ static void add_header(struct buffer *b,
|
||||||
|
|
||||||
static void add_intree_flag(struct buffer *b, int is_intree)
|
static void add_intree_flag(struct buffer *b, int is_intree)
|
||||||
{
|
{
|
||||||
@@ -169,7 +169,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Cannot check for assembler */
|
/* Cannot check for assembler */
|
||||||
@@ -2175,10 +2181,12 @@ static void add_retpoline(struct buffer
|
@@ -2177,10 +2183,12 @@ static void add_retpoline(struct buffer
|
||||||
|
|
||||||
static void add_staging_flag(struct buffer *b, const char *name)
|
static void add_staging_flag(struct buffer *b, const char *name)
|
||||||
{
|
{
|
||||||
@@ -182,7 +182,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -2277,11 +2285,13 @@ static void add_depends(struct buffer *b
|
@@ -2279,11 +2287,13 @@ static void add_depends(struct buffer *b
|
||||||
|
|
||||||
static void add_srcversion(struct buffer *b, struct module *mod)
|
static void add_srcversion(struct buffer *b, struct module *mod)
|
||||||
{
|
{
|
||||||
@@ -196,7 +196,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void write_if_changed(struct buffer *b, const char *fname)
|
static void write_if_changed(struct buffer *b, const char *fname)
|
||||||
@@ -2518,7 +2528,9 @@ int main(int argc, char **argv)
|
@@ -2520,7 +2530,9 @@ int main(int argc, char **argv)
|
||||||
add_staging_flag(&buf, mod->name);
|
add_staging_flag(&buf, mod->name);
|
||||||
err |= add_versions(&buf, mod);
|
err |= add_versions(&buf, mod);
|
||||||
add_depends(&buf, mod, modules);
|
add_depends(&buf, mod, modules);
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
|
|||||||
|
|
||||||
--- a/drivers/base/power/opp/core.c
|
--- a/drivers/base/power/opp/core.c
|
||||||
+++ b/drivers/base/power/opp/core.c
|
+++ b/drivers/base/power/opp/core.c
|
||||||
@@ -1277,11 +1277,13 @@ struct opp_table *dev_pm_opp_set_regulat
|
@@ -1280,11 +1280,13 @@ struct opp_table *dev_pm_opp_set_regulat
|
||||||
if (!opp_table)
|
if (!opp_table)
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
|
|||||||
|
|
||||||
--- a/drivers/base/power/opp/core.c
|
--- a/drivers/base/power/opp/core.c
|
||||||
+++ b/drivers/base/power/opp/core.c
|
+++ b/drivers/base/power/opp/core.c
|
||||||
@@ -1605,6 +1605,83 @@ put_table:
|
@@ -1608,6 +1608,83 @@ put_table:
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
|
|||||||
|
|
||||||
--- a/drivers/base/power/opp/core.c
|
--- a/drivers/base/power/opp/core.c
|
||||||
+++ b/drivers/base/power/opp/core.c
|
+++ b/drivers/base/power/opp/core.c
|
||||||
@@ -1649,6 +1649,7 @@ int dev_pm_opp_adjust_voltage(struct dev
|
@@ -1652,6 +1652,7 @@ int dev_pm_opp_adjust_voltage(struct dev
|
||||||
struct opp_table *opp_table;
|
struct opp_table *opp_table;
|
||||||
struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV);
|
struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV);
|
||||||
int r = 0;
|
int r = 0;
|
||||||
@@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
|
|||||||
|
|
||||||
/* keep the node allocated */
|
/* keep the node allocated */
|
||||||
new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);
|
new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);
|
||||||
@@ -1685,6 +1686,10 @@ int dev_pm_opp_adjust_voltage(struct dev
|
@@ -1688,6 +1689,10 @@ int dev_pm_opp_adjust_voltage(struct dev
|
||||||
|
|
||||||
/* plug in new node */
|
/* plug in new node */
|
||||||
new_opp->supplies[0].u_volt = u_volt;
|
new_opp->supplies[0].u_volt = u_volt;
|
||||||
|
|||||||
@@ -249,7 +249,7 @@
|
|||||||
|
|
||||||
--- a/net/dsa/slave.c
|
--- a/net/dsa/slave.c
|
||||||
+++ b/net/dsa/slave.c
|
+++ b/net/dsa/slave.c
|
||||||
@@ -1263,7 +1263,7 @@ int dsa_slave_create(struct dsa_port *po
|
@@ -1267,7 +1267,7 @@ int dsa_slave_create(struct dsa_port *po
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
cpu_dp = ds->dst->cpu_dp;
|
cpu_dp = ds->dst->cpu_dp;
|
||||||
@@ -258,7 +258,7 @@
|
|||||||
|
|
||||||
if (!ds->num_tx_queues)
|
if (!ds->num_tx_queues)
|
||||||
ds->num_tx_queues = 1;
|
ds->num_tx_queues = 1;
|
||||||
@@ -1301,6 +1301,7 @@ int dsa_slave_create(struct dsa_port *po
|
@@ -1305,6 +1305,7 @@ int dsa_slave_create(struct dsa_port *po
|
||||||
p->dp = port;
|
p->dp = port;
|
||||||
INIT_LIST_HEAD(&p->mall_tc_list);
|
INIT_LIST_HEAD(&p->mall_tc_list);
|
||||||
p->xmit = dst->tag_ops->xmit;
|
p->xmit = dst->tag_ops->xmit;
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
@@ -759,7 +760,31 @@ static void mtu3_hw_exit(struct mtu3 *mt
|
@@ -761,7 +762,31 @@ static void mtu3_hw_exit(struct mtu3 *mt
|
||||||
mtu3_mem_free(mtu);
|
mtu3_mem_free(mtu);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|||||||
|
|
||||||
int ssusb_gadget_init(struct ssusb_mtk *ssusb)
|
int ssusb_gadget_init(struct ssusb_mtk *ssusb)
|
||||||
{
|
{
|
||||||
@@ -820,6 +845,12 @@ int ssusb_gadget_init(struct ssusb_mtk *
|
@@ -822,6 +847,12 @@ int ssusb_gadget_init(struct ssusb_mtk *
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +120,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|||||||
ret = devm_request_irq(dev, mtu->irq, mtu3_irq, 0, dev_name(dev), mtu);
|
ret = devm_request_irq(dev, mtu->irq, mtu3_irq, 0, dev_name(dev), mtu);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "request irq %d failed!\n", mtu->irq);
|
dev_err(dev, "request irq %d failed!\n", mtu->irq);
|
||||||
@@ -845,6 +876,7 @@ int ssusb_gadget_init(struct ssusb_mtk *
|
@@ -847,6 +878,7 @@ int ssusb_gadget_init(struct ssusb_mtk *
|
||||||
gadget_err:
|
gadget_err:
|
||||||
device_init_wakeup(dev, false);
|
device_init_wakeup(dev, false);
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|||||||
}
|
}
|
||||||
|
|
||||||
dev_info(mtu->dev, "max_speed: %s\n",
|
dev_info(mtu->dev, "max_speed: %s\n",
|
||||||
@@ -624,6 +627,10 @@ static irqreturn_t mtu3_link_isr(struct
|
@@ -626,6 +629,10 @@ static irqreturn_t mtu3_link_isr(struct
|
||||||
udev_speed = USB_SPEED_SUPER;
|
udev_speed = USB_SPEED_SUPER;
|
||||||
maxpkt = 512;
|
maxpkt = 512;
|
||||||
break;
|
break;
|
||||||
@@ -57,7 +57,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|||||||
default:
|
default:
|
||||||
udev_speed = USB_SPEED_UNKNOWN;
|
udev_speed = USB_SPEED_UNKNOWN;
|
||||||
break;
|
break;
|
||||||
@@ -825,14 +832,15 @@ int ssusb_gadget_init(struct ssusb_mtk *
|
@@ -827,14 +834,15 @@ int ssusb_gadget_init(struct ssusb_mtk *
|
||||||
case USB_SPEED_FULL:
|
case USB_SPEED_FULL:
|
||||||
case USB_SPEED_HIGH:
|
case USB_SPEED_HIGH:
|
||||||
case USB_SPEED_SUPER:
|
case USB_SPEED_SUPER:
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -428,6 +428,9 @@ uart_get_baud_rate(struct uart_port *por
|
@@ -431,6 +431,9 @@ uart_get_baud_rate(struct uart_port *por
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/arch/mips/ralink/Kconfig
|
--- a/arch/mips/ralink/Kconfig
|
||||||
+++ b/arch/mips/ralink/Kconfig
|
+++ b/arch/mips/ralink/Kconfig
|
||||||
@@ -57,6 +57,7 @@ choice
|
@@ -58,6 +58,7 @@ choice
|
||||||
select COMMON_CLK
|
select COMMON_CLK
|
||||||
select CLKSRC_MIPS_GIC
|
select CLKSRC_MIPS_GIC
|
||||||
select HW_HAS_PCI
|
select HW_HAS_PCI
|
||||||
|
|||||||
@@ -69,7 +69,7 @@
|
|||||||
void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
|
void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
|
||||||
--- a/arch/mips/ralink/Kconfig
|
--- a/arch/mips/ralink/Kconfig
|
||||||
+++ b/arch/mips/ralink/Kconfig
|
+++ b/arch/mips/ralink/Kconfig
|
||||||
@@ -58,6 +58,7 @@ choice
|
@@ -59,6 +59,7 @@ choice
|
||||||
select CLKSRC_MIPS_GIC
|
select CLKSRC_MIPS_GIC
|
||||||
select HW_HAS_PCI
|
select HW_HAS_PCI
|
||||||
select WEAK_REORDERING_BEYOND_LLSC
|
select WEAK_REORDERING_BEYOND_LLSC
|
||||||
|
|||||||
Reference in New Issue
Block a user