hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: bump 4.14 to 4.14.138

Browse Source 
Refreshed all patches.

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
master
Koen Vandeputte 5 years ago
parent 46e9a9b04e
commit bc138c5b72
9 changed files with 27 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      include/kernel-version.mk
  2. 4
      target/linux/brcm2708/patches-4.14/950-0012-spi-bcm2835-Support-pin-groups-other-than-7-11.patch
  3. 4
      target/linux/brcm2708/patches-4.14/950-0013-spi-bcm2835-Disable-forced-software-CS.patch
  4. 4
      target/linux/brcm2708/patches-4.14/950-0014-spi-bcm2835-Remove-unused-code.patch
  5. 6
      target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
  6. 4
      target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
  7. 22
      target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
  8. 2
      target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
  9. 4
      target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch

4
include/kernel-version.mk
Unescape View File

@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif endif
LINUX_VERSION-4.14 = .137 LINUX_VERSION-4.14 = .138
LINUX_KERNEL_HASH-4.14.137 = 93f8e91329300f325a5b4dd9de1f51c0b1bf9591dfd2274044c2f70f96bae228 LINUX_KERNEL_HASH-4.14.138 = f250bd1de3a83c1f015f8e6e9bfa9f20eaef3dc24a6cd60116e49979314b837b
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)))))))

4
target/linux/brcm2708/patches-4.14/950-0012-spi-bcm2835-Support-pin-groups-other-than-7-11.patch
Unescape View File

@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/spi/spi-bcm2835.c --- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c
@@ -686,6 +686,8 @@ static int bcm2835_spi_setup(struct spi_ @@ -687,6 +687,8 @@ static int bcm2835_spi_setup(struct spi_
{ {
int err; int err;
struct gpio_chip *chip; struct gpio_chip *chip;
@ -28,7 +28,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* /*
* sanity checking the native-chipselects * sanity checking the native-chipselects
*/ */
@@ -702,15 +704,42 @@ static int bcm2835_spi_setup(struct spi_ @@ -703,15 +705,42 @@ static int bcm2835_spi_setup(struct spi_
"setup: only two native chip-selects are supported\n"); "setup: only two native chip-selects are supported\n");
return -EINVAL; return -EINVAL;
} }

4
target/linux/brcm2708/patches-4.14/950-0013-spi-bcm2835-Disable-forced-software-CS.patch
Unescape View File

@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/spi/spi-bcm2835.c --- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c
@@ -705,6 +705,7 @@ static int bcm2835_spi_setup(struct spi_ @@ -706,6 +706,7 @@ static int bcm2835_spi_setup(struct spi_
return -EINVAL; return -EINVAL;
} }
@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* now translate native cs to GPIO */ /* now translate native cs to GPIO */
/* first look for chip select pins in the devices pin groups */ /* first look for chip select pins in the devices pin groups */
for (pingroup_index = 0; for (pingroup_index = 0;
@@ -754,6 +755,7 @@ static int bcm2835_spi_setup(struct spi_ @@ -755,6 +756,7 @@ static int bcm2835_spi_setup(struct spi_
spi->chip_select, spi->cs_gpio, err); spi->chip_select, spi->cs_gpio, err);
return err; return err;
} }

4
target/linux/brcm2708/patches-4.14/950-0014-spi-bcm2835-Remove-unused-code.patch
Unescape View File

@ -9,7 +9,7 @@ Subject: [PATCH 014/454] spi-bcm2835: Remove unused code
--- a/drivers/spi/spi-bcm2835.c --- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c
@@ -677,17 +677,8 @@ static void bcm2835_spi_set_cs(struct sp @@ -678,17 +678,8 @@ static void bcm2835_spi_set_cs(struct sp
bcm2835_wr(bs, BCM2835_SPI_CS, cs); bcm2835_wr(bs, BCM2835_SPI_CS, cs);
} }
@ -27,7 +27,7 @@ Subject: [PATCH 014/454] spi-bcm2835: Remove unused code
/* /*
* sanity checking the native-chipselects * sanity checking the native-chipselects
*/ */
@@ -705,58 +696,6 @@ static int bcm2835_spi_setup(struct spi_ @@ -706,58 +697,6 @@ static int bcm2835_spi_setup(struct spi_
return -EINVAL; return -EINVAL;
} }

6
target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
Unescape View File

@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/cgroup/cgroup.c --- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c
@@ -5168,6 +5168,8 @@ int __init cgroup_init_early(void) @@ -5206,6 +5206,8 @@ int __init cgroup_init_early(void)
} }
static u16 cgroup_disable_mask __initdata; static u16 cgroup_disable_mask __initdata;
@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/** /**
* cgroup_init - cgroup initialization * cgroup_init - cgroup initialization
@@ -5206,6 +5208,12 @@ int __init cgroup_init(void) @@ -5244,6 +5246,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex); mutex_unlock(&cgroup_mutex);
@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) { for_each_subsys(ss, ssid) {
if (ss->early_init) { if (ss->early_init) {
struct cgroup_subsys_state *css = struct cgroup_subsys_state *css =
@@ -5589,6 +5597,28 @@ static int __init cgroup_disable(char *s @@ -5635,6 +5643,28 @@ static int __init cgroup_disable(char *s
} }
__setup("cgroup_disable=", cgroup_disable); __setup("cgroup_disable=", cgroup_disable);

4
target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
Unescape View File

@ -65,7 +65,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
* Before updating sk_refcnt, we must commit prior changes to memory * Before updating sk_refcnt, we must commit prior changes to memory
--- a/net/ipv4/tcp_output.c --- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c
@@ -1687,7 +1687,7 @@ u32 tcp_tso_autosize(const struct sock * @@ -1696,7 +1696,7 @@ u32 tcp_tso_autosize(const struct sock *
{ {
u32 bytes, segs; u32 bytes, segs;
@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
/* Goal is to send at least one packet per ms, /* Goal is to send at least one packet per ms,
@@ -2204,7 +2204,7 @@ static bool tcp_small_queue_check(struct @@ -2213,7 +2213,7 @@ static bool tcp_small_queue_check(struct
{ {
unsigned int limit; unsigned int limit;

22
target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
Unescape View File

@ -300,7 +300,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
/** /**
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
* @t: the outgoing tunnel device * @t: the outgoing tunnel device
@@ -1306,6 +1446,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str @@ -1305,6 +1445,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
{ {
struct ip6_tnl *t = netdev_priv(dev); struct ip6_tnl *t = netdev_priv(dev);
struct ipv6hdr *ipv6h; struct ipv6hdr *ipv6h;
@ -309,8 +309,8 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
__u16 offset; __u16 offset;
struct flowi6 fl6; struct flowi6 fl6;
@@ -1372,6 +1513,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str @@ -1372,6 +1513,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL); fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h));
+ /* try to find matching FMR */ + /* try to find matching FMR */
+ for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) { + for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
@ -327,7 +327,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6)) if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
return -1; return -1;
@@ -1500,6 +1653,14 @@ ip6_tnl_change(struct ip6_tnl *t, const @@ -1498,6 +1651,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.link = p->link; t->parms.link = p->link;
t->parms.proto = p->proto; t->parms.proto = p->proto;
t->parms.fwmark = p->fwmark; t->parms.fwmark = p->fwmark;
@ -342,7 +342,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
dst_cache_reset(&t->dst_cache); dst_cache_reset(&t->dst_cache);
ip6_tnl_link_config(t); ip6_tnl_link_config(t);
return 0; return 0;
@@ -1538,6 +1699,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ @@ -1536,6 +1697,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
p->flowinfo = u->flowinfo; p->flowinfo = u->flowinfo;
p->link = u->link; p->link = u->link;
p->proto = u->proto; p->proto = u->proto;
@ -350,7 +350,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
memcpy(p->name, u->name, sizeof(u->name)); memcpy(p->name, u->name, sizeof(u->name));
} }
@@ -1924,6 +2086,15 @@ static int ip6_tnl_validate(struct nlatt @@ -1922,6 +2084,15 @@ static int ip6_tnl_validate(struct nlatt
return 0; return 0;
} }
@ -366,7 +366,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
static void ip6_tnl_netlink_parms(struct nlattr *data[], static void ip6_tnl_netlink_parms(struct nlattr *data[],
struct __ip6_tnl_parm *parms) struct __ip6_tnl_parm *parms)
{ {
@@ -1961,6 +2132,46 @@ static void ip6_tnl_netlink_parms(struct @@ -1959,6 +2130,46 @@ static void ip6_tnl_netlink_parms(struct
if (data[IFLA_IPTUN_FWMARK]) if (data[IFLA_IPTUN_FWMARK])
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
@ -413,7 +413,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
} }
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[], static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
@@ -2076,6 +2287,12 @@ static void ip6_tnl_dellink(struct net_d @@ -2074,6 +2285,12 @@ static void ip6_tnl_dellink(struct net_d
static size_t ip6_tnl_get_size(const struct net_device *dev) static size_t ip6_tnl_get_size(const struct net_device *dev)
{ {
@ -426,7 +426,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
return return
/* IFLA_IPTUN_LINK */ /* IFLA_IPTUN_LINK */
nla_total_size(4) + nla_total_size(4) +
@@ -2105,6 +2322,24 @@ static size_t ip6_tnl_get_size(const str @@ -2103,6 +2320,24 @@ static size_t ip6_tnl_get_size(const str
nla_total_size(0) + nla_total_size(0) +
/* IFLA_IPTUN_FWMARK */ /* IFLA_IPTUN_FWMARK */
nla_total_size(4) + nla_total_size(4) +
@ -451,7 +451,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
0; 0;
} }
@@ -2112,6 +2347,9 @@ static int ip6_tnl_fill_info(struct sk_b @@ -2110,6 +2345,9 @@ static int ip6_tnl_fill_info(struct sk_b
{ {
struct ip6_tnl *tunnel = netdev_priv(dev); struct ip6_tnl *tunnel = netdev_priv(dev);
struct __ip6_tnl_parm *parm = &tunnel->parms; struct __ip6_tnl_parm *parm = &tunnel->parms;
@ -461,7 +461,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
@@ -2121,9 +2359,27 @@ static int ip6_tnl_fill_info(struct sk_b @@ -2119,9 +2357,27 @@ static int ip6_tnl_fill_info(struct sk_b
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) || nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
@ -490,7 +490,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) || if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) || nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
@@ -2163,6 +2419,7 @@ static const struct nla_policy ip6_tnl_p @@ -2161,6 +2417,7 @@ static const struct nla_policy ip6_tnl_p
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG }, [IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 }, [IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },

2
target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
Unescape View File

@ -49,7 +49,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}; };
--- a/drivers/net/phy/phylink.c --- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c
@@ -1058,34 +1058,6 @@ int phylink_ethtool_set_pauseparam(struc @@ -1060,34 +1060,6 @@ int phylink_ethtool_set_pauseparam(struc
} }
EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam); EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam);

4
target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
Unescape View File

@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c --- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c
@@ -775,8 +775,8 @@ void phylink_start(struct phylink *pl) @@ -777,8 +777,8 @@ void phylink_start(struct phylink *pl)
clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
phylink_run_resolve(pl); phylink_run_resolve(pl);
@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (pl->phydev) if (pl->phydev)
phy_start(pl->phydev); phy_start(pl->phydev);
} }
@@ -788,8 +788,8 @@ void phylink_stop(struct phylink *pl) @@ -790,8 +790,8 @@ void phylink_stop(struct phylink *pl)
if (pl->phydev) if (pl->phydev)
phy_stop(pl->phydev); phy_stop(pl->phydev);

Write Preview
Loading…
Cancel
Save