fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 4.9 to 4.9.238

Browse Source 
Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2020-10-03 01:14:39 +08:00
parent 6828ea441a
commit 0a7b738e09
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
16 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .237
LINUX_VERSION-4.9 = .238
LINUX_VERSION-4.14 = .200
LINUX_VERSION-4.19 = .149
LINUX_KERNEL_HASH-4.9.237 = 81ec5792c0ccdc244faff9dbb3d9c97857d9df4cb1f0c1c3db6bc4031faf861f
LINUX_KERNEL_HASH-4.9.238 = b1eaf60b771ec4df0546d2b7539e164355008ea2f680a0642ae430e9cb134a3f
LINUX_KERNEL_HASH-4.14.200 = 5d404a0224a34b5379f1871cc46825487d557c2660459d2b5c3cd4871d699a38
LINUX_KERNEL_HASH-4.19.149 = d9cdcb9a66942a56b91c8d4b273d15a3c5b8e59fad44b79e03362cfffaa62a00

14
target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1637,7 +1637,7 @@ static int __xipram do_write_oneword(str
@@ -1636,7 +1636,7 @@ static int __xipram do_write_oneword(str
}
if (chip_good(map, adr, datum))
@ -9,7 +9,7 @@
/* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1);
@@ -1654,6 +1654,8 @@ static int __xipram do_write_oneword(str
@@ -1653,6 +1653,8 @@ static int __xipram do_write_oneword(str
goto retry;
}
}
@ -18,7 +18,7 @@
xip_enable(map, chip, adr);
op_done:
if (mode == FL_OTP_WRITE)
@@ -2236,7 +2238,6 @@ static int cfi_amdstd_panic_write(struct
@@ -2235,7 +2237,6 @@ static int cfi_amdstd_panic_write(struct
return 0;
}
@ -26,7 +26,7 @@
/*
* Handle devices with one erase region, that only implement
* the chip erase command.
@@ -2304,7 +2305,7 @@ static int __xipram do_erase_chip(struct
@@ -2303,7 +2304,7 @@ static int __xipram do_erase_chip(struct
}
if (chip_good(map, adr, map_word_ff(map)))
@ -35,7 +35,7 @@
if (time_after(jiffies, timeo)) {
printk(KERN_WARNING "MTD %s(): software timeout\n",
@@ -2328,6 +2329,7 @@ static int __xipram do_erase_chip(struct
@@ -2327,6 +2328,7 @@ static int __xipram do_erase_chip(struct
}
}
@ -43,7 +43,7 @@
chip->state = FL_READY;
xip_enable(map, chip, adr);
DISABLE_VPP(map);
@@ -2401,7 +2403,7 @@ static int __xipram do_erase_oneblock(st
@@ -2400,7 +2402,7 @@ static int __xipram do_erase_oneblock(st
if (chip_good(map, adr, map_word_ff(map))) {
xip_enable(map, chip, adr);
@ -52,7 +52,7 @@
}
if (time_after(jiffies, timeo)) {
@@ -2427,6 +2429,7 @@ static int __xipram do_erase_oneblock(st
@@ -2426,6 +2428,7 @@ static int __xipram do_erase_oneblock(st
}
}

6
target/linux/ar71xx/patches-4.9/411-mtd-cfi_cmdset_0002-force-word-write.patch
View File

@ -35,7 +35,7 @@
/* Atmel chips don't use the same PRI format as AMD chips */
static void fixup_convert_atmel_pri(struct mtd_info *mtd)
@@ -1796,6 +1800,7 @@ static int cfi_amdstd_write_words(struct
@@ -1795,6 +1799,7 @@ static int cfi_amdstd_write_words(struct
/*
* FIXME: interleaved mode not tested, and probably not supported!
*/
@ -43,7 +43,7 @@
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
unsigned long adr, const u_char *buf,
int len)
@@ -1928,7 +1933,6 @@ static int __xipram do_write_buffer(stru
@@ -1927,7 +1932,6 @@ static int __xipram do_write_buffer(stru
return ret;
}
@ -51,7 +51,7 @@
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf)
{
@@ -2003,6 +2007,7 @@ static int cfi_amdstd_write_buffers(stru
@@ -2002,6 +2006,7 @@ static int cfi_amdstd_write_buffers(stru
return 0;
}

2
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
View File

@ -316,7 +316,7 @@
for (p = *head; p; p = p->next) {
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -459,7 +459,7 @@ static struct neighbour *ipv4_neigh_look
@@ -460,7 +460,7 @@ static struct neighbour *ipv4_neigh_look
else if (skb)
pkey = &ip_hdr(skb)->daddr;

4
target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -452,16 +452,22 @@ static enum hrtimer_restart wbuf_timer_c
@@ -464,16 +464,22 @@ static enum hrtimer_restart wbuf_timer_c
*/
static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
{
@ -48,7 +48,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
HRTIMER_MODE_REL);
}
@@ -1059,10 +1065,6 @@ int ubifs_wbuf_init(struct ubifs_info *c
@@ -1071,10 +1077,6 @@ int ubifs_wbuf_init(struct ubifs_info *c
hrtimer_init(&wbuf->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
wbuf->timer.function = wbuf_timer_callback_nolock;

2
target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch
View File

@ -35,7 +35,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -452,11 +452,11 @@ static enum hrtimer_restart wbuf_timer_c
@@ -464,11 +464,11 @@ static enum hrtimer_restart wbuf_timer_c
*/
static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
{

2
target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
View File

@ -52,7 +52,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
#define free_page(addr) free_pages((addr), 0)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2477,7 +2477,7 @@ static inline struct sk_buff *netdev_all
@@ -2489,7 +2489,7 @@ static inline struct sk_buff *netdev_all
static inline void skb_free_frag(void *addr)
{

2
target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch
View File

@ -15,7 +15,7 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1320,6 +1320,9 @@ int genphy_update_link(struct phy_device
@@ -1321,6 +1321,9 @@ int genphy_update_link(struct phy_device
{
int status;

4
target/linux/generic/hack-4.9/721-phy_packets.patch
View File

@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2359,6 +2359,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2371,6 +2371,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -2479,16 +2483,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2491,16 +2495,6 @@ static inline struct sk_buff *dev_alloc_
}

2
target/linux/generic/hack-4.9/902-debloat_proc.patch
View File

@ -394,7 +394,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -421,6 +421,9 @@ static struct pernet_operations ip_rt_pr
@@ -422,6 +422,9 @@ static struct pernet_operations ip_rt_pr
static int __init ip_rt_proc_init(void)
{

2
target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -807,7 +807,7 @@ static int get_chip(struct map_info *map
@@ -806,7 +806,7 @@ static int get_chip(struct map_info *map
return 0;
case FL_ERASING:

2
target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
View File

@ -7,7 +7,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
1 file changed, 1 insertion(+)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1835,6 +1835,7 @@ static int __xipram do_write_buffer(stru
@@ -1834,6 +1834,7 @@ static int __xipram do_write_buffer(stru
/* Write Buffer Load */
map_write(map, CMD(0x25), cmd_adr);

2
target/linux/generic/pending-4.9/601-add-kernel-imq-support.patch
View File

@ -1525,7 +1525,7 @@
extern struct kmem_cache *skbuff_head_cache;
void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
@@ -3628,6 +3647,10 @@ static inline void __nf_copy(struct sk_b
@@ -3640,6 +3659,10 @@ static inline void __nf_copy(struct sk_b
if (copy)
dst->nfctinfo = src->nfctinfo;
#endif

2
target/linux/generic/pending-4.9/655-increase_skb_pad.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2323,7 +2323,7 @@ static inline int pskb_network_may_pull(
@@ -2335,7 +2335,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD

10
target/linux/generic/pending-4.9/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -4996,6 +5009,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -4999,6 +5012,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
@@ -5897,6 +5913,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -5902,6 +5918,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -5918,6 +5937,12 @@ static void ata_host_release(struct devi
@@ -5923,6 +5942,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -6364,7 +6389,23 @@ int ata_host_register(struct ata_host *h
@@ -6369,7 +6394,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
@@ -888,6 +891,12 @@ struct ata_port {
@@ -889,6 +892,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif

4
target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
View File

@ -105,7 +105,7 @@
case UPIO_AU:
p->serial_out(p, offset, value);
p->serial_in(p, UART_LCR); /* safe, no side-effects */
@@ -2766,6 +2786,7 @@ static int serial8250_request_std_resour
@@ -2780,6 +2800,7 @@ static int serial8250_request_std_resour
case UPIO_MEM32BE:
case UPIO_MEM16:
case UPIO_MEM:
@ -113,7 +113,7 @@
if (!port->mapbase)
break;
@@ -2804,6 +2825,7 @@ static void serial8250_release_std_resou
@@ -2818,6 +2839,7 @@ static void serial8250_release_std_resou
case UPIO_MEM32BE:
case UPIO_MEM16:
case UPIO_MEM: