kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa). Changelogs: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10 096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied upstream and dropped. Signed-off-by: Mathias Kresin <openwrt@kresin.me> [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47104
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/Kconfig
|
||||
+++ b/drivers/mtd/Kconfig
|
||||
@@ -184,6 +184,12 @@ config MTD_BCM47XX_PARTS
|
||||
@@ -179,6 +179,12 @@ config MTD_BCM47XX_PARTS
|
||||
This provides partitions parser for devices based on BCM47xx
|
||||
boards.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/Kconfig
|
||||
+++ b/drivers/mtd/Kconfig
|
||||
@@ -206,6 +206,12 @@ config MTD_MYLOADER_PARTS
|
||||
@@ -201,6 +201,12 @@ config MTD_MYLOADER_PARTS
|
||||
You will still need the parsing functions to be called by the driver
|
||||
for your particular device. It won't happen automatically.
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
--- a/arch/mips/ath79/mach-ubnt-xm.c 2015-08-19 21:26:47.694157530 -0600
|
||||
+++ b/arch/mips/ath79/mach-ubnt-xm.c 2015-08-20 16:24:06.908537535 -0600
|
||||
--- a/arch/mips/ath79/mach-ubnt-xm.c
|
||||
+++ b/arch/mips/ath79/mach-ubnt-xm.c
|
||||
@@ -642,3 +642,59 @@ static void __init ubnt_airgateway_setup
|
||||
MIPS_MACHINE(ATH79_MACH_UBNT_AIRGW, "UBNT-AGW", "Ubiquiti AirGateway",
|
||||
ubnt_airgateway_setup);
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#define AR913X_BASE_FREQ 5000000
|
||||
|
||||
struct clk {
|
||||
@@ -99,8 +99,8 @@
|
||||
@@ -99,8 +99,8 @@ static void __init ar724x_clocks_init(vo
|
||||
div = ((pll >> AR724X_PLL_DIV_SHIFT) & AR724X_PLL_DIV_MASK);
|
||||
freq = div * ref_rate;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
select SOC_AR913X
|
||||
--- a/arch/mips/ath79/Makefile
|
||||
+++ b/arch/mips/ath79/Makefile
|
||||
@@ -50,6 +50,7 @@ obj-$(CONFIG_ATH79_MACH_AP132) += mach-ap132.o
|
||||
@@ -50,6 +50,7 @@ obj-$(CONFIG_ATH79_MACH_AP132) += mach-
|
||||
obj-$(CONFIG_ATH79_MACH_AP136) += mach-ap136.o
|
||||
obj-$(CONFIG_ATH79_MACH_AP143) += mach-ap143.o
|
||||
obj-$(CONFIG_ATH79_MACH_AP147) += mach-ap147.o
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/ath79/Kconfig
|
||||
+++ b/arch/mips/ath79/Kconfig
|
||||
@@ -763,6 +763,16 @@ config ATH79_MACH_CAP4200AG
|
||||
@@ -900,6 +900,16 @@ config ATH79_MACH_CAP4200AG
|
||||
select ATH79_DEV_M25P80
|
||||
select ATH79_DEV_WMAC
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
select SOC_QCA955X
|
||||
--- a/arch/mips/ath79/Makefile
|
||||
+++ b/arch/mips/ath79/Makefile
|
||||
@@ -80,6 +80,7 @@ obj-$(CONFIG_ATH79_MACH_HORNET_UB) += ma
|
||||
@@ -91,6 +91,7 @@ obj-$(CONFIG_ATH79_MACH_HORNET_UB) += ma
|
||||
obj-$(CONFIG_ATH79_MACH_MC_MAC1200R) += mach-mc-mac1200r.o
|
||||
obj-$(CONFIG_ATH79_MACH_MR12) += mach-mr12.o
|
||||
obj-$(CONFIG_ATH79_MACH_MR16) += mach-mr16.o
|
||||
@@ -29,7 +29,7 @@
|
||||
obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o
|
||||
--- a/arch/mips/ath79/machtypes.h
|
||||
+++ b/arch/mips/ath79/machtypes.h
|
||||
@@ -69,6 +69,7 @@ enum ath79_mach_type {
|
||||
@@ -80,6 +80,7 @@ enum ath79_mach_type {
|
||||
ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */
|
||||
ATH79_MACH_MR12, /* Cisco Meraki MR12 */
|
||||
ATH79_MACH_MR16, /* Cisco Meraki MR16 */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/ath79/Kconfig
|
||||
+++ b/arch/mips/ath79/Kconfig
|
||||
@@ -1031,6 +1031,17 @@
|
||||
@@ -1055,6 +1055,17 @@ config ATH79_MACH_TL_WA901ND_V2
|
||||
select ATH79_DEV_M25P80
|
||||
select ATH79_DEV_WMAC
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
select SOC_AR934X
|
||||
--- a/arch/mips/ath79/machtypes.h
|
||||
+++ b/arch/mips/ath79/machtypes.h
|
||||
@@ -152,6 +152,7 @@
|
||||
@@ -155,6 +155,7 @@ enum ath79_mach_type {
|
||||
ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */
|
||||
ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */
|
||||
ATH79_MACH_TL_WA901ND_V3, /* TP-LINK TL-WA901ND v3 */
|
||||
@@ -30,7 +30,7 @@
|
||||
ATH79_MACH_TL_WDR6500_V2, /* TP-LINK TL-WDR6500 v2 */
|
||||
--- a/arch/mips/ath79/Makefile
|
||||
+++ b/arch/mips/ath79/Makefile
|
||||
@@ -128,6 +128,7 @@
|
||||
@@ -131,6 +131,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WA7210N_V2) +
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WA830RE_V2) += mach-tl-wa830re-v2.o
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WA901ND) += mach-tl-wa901nd.o
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2) += mach-tl-wa901nd-v2.o
|
||||
|
||||
@@ -241,7 +241,7 @@
|
||||
*/
|
||||
--- a/net/ipv6/datagram.c
|
||||
+++ b/net/ipv6/datagram.c
|
||||
@@ -414,7 +414,7 @@ int ipv6_recv_error(struct sock *sk, str
|
||||
@@ -424,7 +424,7 @@ int ipv6_recv_error(struct sock *sk, str
|
||||
ipv6_iface_scope_id(&sin->sin6_addr,
|
||||
IP6CB(skb)->iif);
|
||||
} else {
|
||||
@@ -250,7 +250,7 @@
|
||||
&sin->sin6_addr);
|
||||
sin->sin6_scope_id = 0;
|
||||
}
|
||||
@@ -751,12 +751,12 @@ int ip6_datagram_send_ctl(struct net *ne
|
||||
@@ -761,12 +761,12 @@ int ip6_datagram_send_ctl(struct net *ne
|
||||
}
|
||||
|
||||
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
|
||||
@@ -267,7 +267,7 @@
|
||||
case IPV6_2292HOPOPTS:
|
||||
--- a/net/ipv6/ip6_gre.c
|
||||
+++ b/net/ipv6/ip6_gre.c
|
||||
@@ -393,7 +393,7 @@ static void ip6gre_err(struct sk_buff *s
|
||||
@@ -394,7 +394,7 @@ static void ip6gre_err(struct sk_buff *s
|
||||
|
||||
t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
|
||||
flags & GRE_KEY ?
|
||||
@@ -276,7 +276,7 @@
|
||||
p[1]);
|
||||
if (!t)
|
||||
return;
|
||||
@@ -475,11 +475,11 @@ static int ip6gre_rcv(struct sk_buff *sk
|
||||
@@ -476,11 +476,11 @@ static int ip6gre_rcv(struct sk_buff *sk
|
||||
offset += 4;
|
||||
}
|
||||
if (flags&GRE_KEY) {
|
||||
@@ -290,7 +290,7 @@
|
||||
offset += 4;
|
||||
}
|
||||
}
|
||||
@@ -744,7 +744,7 @@ static netdev_tx_t ip6gre_xmit2(struct s
|
||||
@@ -745,7 +745,7 @@ static netdev_tx_t ip6gre_xmit2(struct s
|
||||
|
||||
if (tunnel->parms.o_flags&GRE_SEQ) {
|
||||
++tunnel->o_seqno;
|
||||
@@ -299,7 +299,7 @@
|
||||
ptr--;
|
||||
}
|
||||
if (tunnel->parms.o_flags&GRE_KEY) {
|
||||
@@ -840,7 +840,7 @@ static inline int ip6gre_xmit_ipv6(struc
|
||||
@@ -841,7 +841,7 @@ static inline int ip6gre_xmit_ipv6(struc
|
||||
|
||||
dsfield = ipv6_get_dsfield(ipv6h);
|
||||
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
|
||||
|
||||
Reference in New Issue
Block a user