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

kernel: bump 4.9 to 4.9.229

Browse Source 
Refreshed all patches.

Resolve conflicted:
* 834-ledtrig-libata.patch

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2020-07-01 23:59:02 +08:00
parent ed3ede3169
commit e2dcfff4e7
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
14 changed files with 28 additions and 28 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 = .228
LINUX_VERSION-4.9 = .229
LINUX_VERSION-4.14 = .186
LINUX_VERSION-4.19 = .130
LINUX_KERNEL_HASH-4.9.228 = 8fbff429c6453036a0f79a55b4d85c1885c16999751198ddefdca7a3ff17fc34
LINUX_KERNEL_HASH-4.9.229 = 3256c2835fd95a1a739603e78b02d363eac2ce73a39fa19b13b32da4fc370fdc
LINUX_KERNEL_HASH-4.14.186 = 445b426181005b157a0cd33d663ed61a73c32c669772e066bb30291c6775a260
LINUX_KERNEL_HASH-4.19.130 = a692c0e61dc885b4d6e66ae7bf202dadf7d5538fbf92766ce7cf8e227fd4f00f

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

@ -267,7 +267,7 @@
case IPV6_2292HOPOPTS:
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -397,7 +397,7 @@ static void ip6gre_err(struct sk_buff *s
@@ -400,7 +400,7 @@ static void ip6gre_err(struct sk_buff *s
return;
ipv6h = (const struct ipv6hdr *)skb->data;
greh = (const struct gre_base_hdr *)(skb->data + offset);

2
target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
View File

@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
rwlock_t sk_callback_lock;
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2484,6 +2484,7 @@ void sock_init_data(struct socket *sock,
@@ -2486,6 +2486,7 @@ void sock_init_data(struct socket *sock,
sk->sk_max_pacing_rate = ~0U;
sk->sk_pacing_rate = ~0U;

2
target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -928,6 +928,7 @@ static inline void nand_set_controller_d
@@ -926,6 +926,7 @@ static inline void nand_set_controller_d
#define NAND_MFR_SANDISK 0x45
#define NAND_MFR_INTEL 0x89
#define NAND_MFR_ATO 0x9b

2
target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch
View File

@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
algorithm registration.
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc
@@ -246,12 +246,16 @@ static int cryptomgr_schedule_test(struc
type = alg->cra_flags;
/* This piece of crap needs to disappear into per-type test hooks. */

2
target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch
View File

@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
EXPORT_SYMBOL(default_qdisc_ops);
/* Main transmission queue. */
@@ -772,7 +772,7 @@ static void attach_one_default_qdisc(str
@@ -773,7 +773,7 @@ static void attach_one_default_qdisc(str
void *_unused)
{
struct Qdisc *qdisc;

2
target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -457,146 +457,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea
@@ -458,146 +458,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea
.owner = THIS_MODULE,
};

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

@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2980,10 +2980,20 @@ static int xmit_one(struct sk_buff *skb,
@@ -2976,10 +2976,20 @@ static int xmit_one(struct sk_buff *skb,
#endif
dev_queue_xmit_nit(skb, dev);

2
target/linux/generic/hack-4.9/901-debloat_sock_diag.patch
View File

@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
obj-$(CONFIG_PROC_FS) += net-procfs.o
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1463,9 +1463,11 @@ void sk_destruct(struct sock *sk)
@@ -1464,9 +1464,11 @@ void sk_destruct(struct sock *sk)
static void __sk_free(struct sock *sk)
{

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

@ -328,7 +328,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3093,6 +3093,8 @@ static __net_initdata struct pernet_oper
@@ -3095,6 +3095,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{

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

@ -1592,7 +1592,7 @@
* number or errno values. Not nice, but better than additional function
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -141,6 +141,9 @@
@@ -142,6 +142,9 @@
#include <linux/netfilter_ingress.h>
#include <linux/sctp.h>
#include <linux/crash_dump.h>
@ -1602,7 +1602,7 @@
#include "net-sysfs.h"
@@ -2969,7 +2972,12 @@ static int xmit_one(struct sk_buff *skb,
@@ -2965,7 +2968,12 @@ static int xmit_one(struct sk_buff *skb,
unsigned int len;
int rc;
@ -1615,7 +1615,7 @@
dev_queue_xmit_nit(skb, dev);
len = skb->len;
@@ -3008,6 +3016,8 @@ out:
@@ -3004,6 +3012,8 @@ out:
return skb;
}

10
target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u8 imq_flags:IMQ_F_BITS;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4582,6 +4582,9 @@ static enum gro_result dev_gro_receive(s
@@ -4578,6 +4578,9 @@ static enum gro_result dev_gro_receive(s
enum gro_result ret;
int grow;
@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
@@ -5877,6 +5880,48 @@ static void __netdev_adjacent_dev_unlink
@@ -5873,6 +5876,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info)
@@ -5949,6 +5994,7 @@ static int __netdev_upper_dev_link(struc
@@ -5945,6 +5990,7 @@ static int __netdev_upper_dev_link(struc
goto rollback_lower_mesh;
}
@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -6075,6 +6121,7 @@ void netdev_upper_dev_unlink(struct net_
@@ -6071,6 +6117,7 @@ void netdev_upper_dev_unlink(struct net_
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
}
@@ -6678,6 +6725,7 @@ int dev_set_mac_address(struct net_devic
@@ -6674,6 +6721,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;

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

@ -45,7 +45,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
depends on ACPI
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -731,6 +731,19 @@ u64 ata_tf_read_block(const struct ata_t
@@ -730,6 +730,19 @@ u64 ata_tf_read_block(const struct ata_t
return block;
}
@ -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
@@ -4998,6 +5011,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -4997,6 +5010,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;
@@ -5899,6 +5915,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -5898,6 +5914,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;
@@ -5920,6 +5939,12 @@ static void ata_host_release(struct devi
@@ -5919,6 +5938,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;
}
@@ -6366,7 +6391,23 @@ int ata_host_register(struct ata_host *h
@@ -6365,7 +6390,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;
}
@ -124,17 +124,17 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
rc = ata_tport_add(host->dev,host->ports[i]);
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -38,6 +38,9 @@
#include <linux/acpi.h>
@@ -39,6 +39,9 @@
#include <linux/cdrom.h>
#include <linux/sched.h>
#include <linux/async.h>
+#ifdef CONFIG_ATA_LEDS
+#include <linux/leds.h>
+#endif
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
@@ -884,6 +887,12 @@ struct ata_port {
@@ -887,6 +890,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif

2
target/linux/x86/patches-4.9/200-pcengines-apu2-reboot.patch
View File

@ -1,6 +1,6 @@
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -470,6 +470,16 @@ static struct dmi_system_id __initdata r
@@ -478,6 +478,16 @@ static struct dmi_system_id __initdata r
},
},