mirror of https://github.com/hak5/openwrt.git
kernel: bump 4.14 to 4.14.111
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>openwrt-19.07
parent
1138e0f887
commit
5387bc9cbb
|
@ -4,12 +4,12 @@ LINUX_RELEASE?=1
|
|||
|
||||
LINUX_VERSION-3.18 = .136
|
||||
LINUX_VERSION-4.9 = .168
|
||||
LINUX_VERSION-4.14 = .110
|
||||
LINUX_VERSION-4.14 = .111
|
||||
LINUX_VERSION-4.19 = .25
|
||||
|
||||
LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
|
||||
LINUX_KERNEL_HASH-4.9.168 = 4d451c21effad77de323edc9bfeae095aa1faed1a801ef427d66f5763bef091e
|
||||
LINUX_KERNEL_HASH-4.14.110 = 99ea359464dc8a7ab9862195934a1f3504c38a32af5fa424e3ae56244dd59e72
|
||||
LINUX_KERNEL_HASH-4.14.111 = f8197d56553f864d1d2e97abbe4fca50f8ab5e72089c292d22f0e4395340a6e8
|
||||
LINUX_KERNEL_HASH-4.19.25 = 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
|
|
|
@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|||
#define PPC460EX_SDR0_SRST 0x201
|
||||
--- a/drivers/crypto/amcc/crypto4xx_trng.c
|
||||
+++ b/drivers/crypto/amcc/crypto4xx_trng.c
|
||||
@@ -92,7 +92,7 @@ void ppc4xx_trng_probe(struct crypto4xx_
|
||||
@@ -94,7 +94,7 @@ void ppc4xx_trng_probe(struct crypto4xx_
|
||||
if (!rng)
|
||||
goto err_out;
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
ret = hw_device_init(ci, base);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "can't initialize hardware\n");
|
||||
@@ -1004,7 +1007,7 @@ static int ci_hdrc_probe(struct platform
|
||||
@@ -1011,7 +1014,7 @@ static int ci_hdrc_probe(struct platform
|
||||
goto deinit_gadget;
|
||||
}
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
|
|||
platform_set_drvdata(dev, fb);
|
||||
--- a/drivers/video/fbdev/core/fbmem.c
|
||||
+++ b/drivers/video/fbdev/core/fbmem.c
|
||||
@@ -1090,6 +1090,31 @@ fb_blank(struct fb_info *info, int blank
|
||||
@@ -1093,6 +1093,31 @@ fb_blank(struct fb_info *info, int blank
|
||||
}
|
||||
EXPORT_SYMBOL(fb_blank);
|
||||
|
||||
|
@ -202,7 +202,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
|
|||
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
@@ -1100,6 +1125,7 @@ static long do_fb_ioctl(struct fb_info *
|
||||
@@ -1103,6 +1128,7 @@ static long do_fb_ioctl(struct fb_info *
|
||||
struct fb_cmap cmap_from;
|
||||
struct fb_cmap_user cmap;
|
||||
struct fb_event event;
|
||||
|
@ -210,7 +210,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
|
|||
void __user *argp = (void __user *)arg;
|
||||
long ret = 0;
|
||||
|
||||
@@ -1217,6 +1243,15 @@ static long do_fb_ioctl(struct fb_info *
|
||||
@@ -1220,6 +1246,15 @@ static long do_fb_ioctl(struct fb_info *
|
||||
unlock_fb_info(info);
|
||||
console_unlock();
|
||||
break;
|
||||
|
@ -226,7 +226,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
|
|||
default:
|
||||
if (!lock_fb_info(info))
|
||||
return -ENODEV;
|
||||
@@ -1362,6 +1397,7 @@ static long fb_compat_ioctl(struct file
|
||||
@@ -1365,6 +1400,7 @@ static long fb_compat_ioctl(struct file
|
||||
case FBIOPAN_DISPLAY:
|
||||
case FBIOGET_CON2FBMAP:
|
||||
case FBIOPUT_CON2FBMAP:
|
||||
|
|
|
@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||
for_each_subsys(ss, ssid) {
|
||||
if (ss->early_init) {
|
||||
struct cgroup_subsys_state *css =
|
||||
@@ -5580,6 +5588,28 @@ static int __init cgroup_disable(char *s
|
||||
@@ -5583,6 +5591,28 @@ static int __init cgroup_disable(char *s
|
||||
}
|
||||
__setup("cgroup_disable=", cgroup_disable);
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
#endif
|
||||
--- a/net/bridge/br_netfilter_hooks.c
|
||||
+++ b/net/bridge/br_netfilter_hooks.c
|
||||
@@ -992,7 +992,7 @@ int br_nf_hook_thresh(unsigned int hook,
|
||||
@@ -987,7 +987,7 @@ int br_nf_hook_thresh(unsigned int hook,
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
};
|
||||
--- a/net/netfilter/nf_conntrack_core.c
|
||||
+++ b/net/netfilter/nf_conntrack_core.c
|
||||
@@ -917,6 +917,9 @@ static unsigned int early_drop_list(stru
|
||||
@@ -925,6 +925,9 @@ static unsigned int early_drop_list(stru
|
||||
hlist_nulls_for_each_entry_rcu(h, n, head, hnnode) {
|
||||
tmp = nf_ct_tuplehash_to_ctrack(h);
|
||||
|
||||
|
@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (nf_ct_is_expired(tmp)) {
|
||||
nf_ct_gc_expired(tmp);
|
||||
continue;
|
||||
@@ -994,6 +997,18 @@ static bool gc_worker_can_early_drop(con
|
||||
@@ -1002,6 +1005,18 @@ static bool gc_worker_can_early_drop(con
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -76,7 +76,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static void gc_worker(struct work_struct *work)
|
||||
{
|
||||
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
|
||||
@@ -1030,6 +1045,11 @@ static void gc_worker(struct work_struct
|
||||
@@ -1038,6 +1053,11 @@ static void gc_worker(struct work_struct
|
||||
tmp = nf_ct_tuplehash_to_ctrack(h);
|
||||
|
||||
scanned++;
|
||||
|
|
|
@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
|
||||
--- a/net/netfilter/nf_conntrack_core.c
|
||||
+++ b/net/netfilter/nf_conntrack_core.c
|
||||
@@ -997,18 +997,6 @@ static bool gc_worker_can_early_drop(con
|
||||
@@ -1005,18 +1005,6 @@ static bool gc_worker_can_early_drop(con
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
static void gc_worker(struct work_struct *work)
|
||||
{
|
||||
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
|
||||
@@ -1045,10 +1033,8 @@ static void gc_worker(struct work_struct
|
||||
@@ -1053,10 +1041,8 @@ static void gc_worker(struct work_struct
|
||||
tmp = nf_ct_tuplehash_to_ctrack(h);
|
||||
|
||||
scanned++;
|
||||
|
|
|
@ -232,7 +232,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
return -ENOMEM;
|
||||
--- a/mm/vmalloc.c
|
||||
+++ b/mm/vmalloc.c
|
||||
@@ -2770,6 +2770,8 @@ static const struct file_operations proc
|
||||
@@ -2774,6 +2774,8 @@ static const struct file_operations proc
|
||||
|
||||
static int __init proc_vmalloc_init(void)
|
||||
{
|
||||
|
|
|
@ -440,9 +440,9 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
|
||||
irq = dwc3_gadget_get_irq(dwc);
|
||||
if (irq < 0) {
|
||||
@@ -3286,6 +3287,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
|
||||
goto err4;
|
||||
}
|
||||
@@ -3288,6 +3289,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
|
||||
|
||||
dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed);
|
||||
|
||||
+ if (dwc->disable_devinit_u1u2_quirk) {
|
||||
+ reg = dwc3_readl(dwc->regs, DWC3_DCTL);
|
||||
|
|
|
@ -40,7 +40,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
|||
|
||||
--- a/drivers/md/dm-thin.c
|
||||
+++ b/drivers/md/dm-thin.c
|
||||
@@ -3690,6 +3690,19 @@ static int process_create_thin_mesg(unsi
|
||||
@@ -3697,6 +3697,19 @@ static int process_create_thin_mesg(unsi
|
||||
return r;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue