merge lean's source

include/kernel-version.mk

@@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.9 = .187
-LINUX_VERSION-4.14 = .136
-LINUX_VERSION-4.19 = .64
+LINUX_VERSION-4.9 = .189
+LINUX_VERSION-4.14 = .138
+LINUX_VERSION-4.19 = .66
 
-LINUX_KERNEL_HASH-4.9.187 = 014bcd042cd25e073539c17bd34c616a936b19787a9c6a4c35d36a4f28afd1c7
-LINUX_KERNEL_HASH-4.14.136 = 268dff959216e59437a8f9db7c2cea3a1ada8a4c72232dc5b7f83ecca12bdf70
-LINUX_KERNEL_HASH-4.19.64 = 7a6f8be33df3bef763495e8dde7a2fd7cdad71d7b952cd740b68eaac1bab5abd
+LINUX_KERNEL_HASH-4.9.189 = 93d945661246f726b694455c80c140717d2beff5a718445a51183439bbe5d0b3
+LINUX_KERNEL_HASH-4.14.138 = f250bd1de3a83c1f015f8e6e9bfa9f20eaef3dc24a6cd60116e49979314b837b
+LINUX_KERNEL_HASH-4.19.66 = c981abe15c4b9496cdadb04e4f4afb88b3a78f31ced8d07684ee9c58b3fadb64
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

package/lean/default-settings/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=default-settings
 PKG_VERSION:=1.1
-PKG_RELEASE:=43
+PKG_RELEASE:=44
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
 

package/lean/default-settings/files/zzz-default-settings

@@ -55,7 +55,7 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
 wifi up
 
 sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
-echo "DISTRIB_REVISION='R9.8.5 built by Lean & KFERM'" >> /etc/openwrt_release
+echo "DISTRIB_REVISION='R9.8.17 built by Lean & KFERM'" >> /etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
 echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release
 

package/lean/luci-app-autoreboot/Makefile

@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for Scheduled Reboot
 LUCI_DEPENDS:=+luci
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.0
-PKG_RELEASE:=9
+PKG_RELEASE:=8
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

package/lean/luci-app-autoreboot/luasrc/model/cbi/autoreboot.lua

@@ -11,15 +11,15 @@ enable.rmempty = false
 enable.default=0
 
 week=s:option(ListValue,"week",translate("Week Day"))
-week:value(*,translate("Everyday"))
+week:value(0,translate("Everyday"))
 week:value(1,translate("Monday"))
 week:value(2,translate("Tuesday"))
 week:value(3,translate("Wednesday"))
 week:value(4,translate("Thursday"))
 week:value(5,translate("Friday"))
 week:value(6,translate("Saturday"))
-week:value(0,translate("Sunday"))
-week.default=3
+week:value(7,translate("Sunday"))
+week.default=0
 
 hour=s:option(Value,"hour",translate("Hour"))
 hour.datatype = "range(0,23)"

target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch

@@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/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;
  	struct gpio_chip *chip;
@@ -28,7 +28,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	/*
  	 * 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");
  		return -EINVAL;
  	}

target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch

@@ -16,15 +16,15 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/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;
  	}
 
 +#if 0
  	/* now translate native cs to GPIO */
  	/* first look for chip select pins in the devices pin groups */
  	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);
  		return err;
  	}

target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 013/725] spi-bcm2835: Remove unused code
 
 --- a/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);
  }
 
@@ -27,7 +27,7 @@ Subject: [PATCH 013/725] spi-bcm2835: Remove unused code
  	/*
  	 * 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;
  	}
 

target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch

@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -5296,6 +5296,8 @@ int __init cgroup_init_early(void)
+@@ -5334,6 +5334,8 @@ int __init cgroup_init_early(void)
  }
 
  static u16 cgroup_disable_mask __initdata;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
  /**
   * cgroup_init - cgroup initialization
-@@ -5336,6 +5338,12 @@ int __init cgroup_init(void)
+@@ -5374,6 +5376,12 @@ int __init cgroup_init(void)
 
  	mutex_unlock(&cgroup_mutex);
 
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -5719,6 +5727,28 @@ static int __init cgroup_disable(char *s
+@@ -5765,6 +5773,28 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
 

target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch

@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  /* Device and char device-related information */
  static DEFINE_IDA(gpio_ida);
  static dev_t gpio_devt;
-@@ -2624,7 +2626,7 @@ int gpiod_direction_output(struct gpio_d
+@@ -2626,7 +2628,7 @@ int gpiod_direction_output(struct gpio_d
  		value = !!value;
 
  	/* GPIOs used for IRQs shall not be set as output */
@@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  		gpiod_err(desc,
  			  "%s: tried to set a GPIO tied to an IRQ as output\n",
  			  __func__);
-@@ -3312,7 +3314,7 @@ int gpiochip_lock_as_irq(struct gpio_chi
+@@ -3314,7 +3316,7 @@ int gpiochip_lock_as_irq(struct gpio_chi
  		}
  	}
 

target/linux/brcm2708/patches-4.19/950-0430-Revert-cgroup-Disable-cgroup-memory-by-default.patch

@@ -10,7 +10,7 @@ This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -5296,8 +5296,6 @@ int __init cgroup_init_early(void)
+@@ -5334,8 +5334,6 @@ int __init cgroup_init_early(void)
  }
 
  static u16 cgroup_disable_mask __initdata;
@@ -19,7 +19,7 @@ This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
 
  /**
   * cgroup_init - cgroup initialization
-@@ -5338,12 +5336,6 @@ int __init cgroup_init(void)
+@@ -5376,12 +5374,6 @@ int __init cgroup_init(void)
 
  	mutex_unlock(&cgroup_mutex);
 
@@ -32,7 +32,7 @@ This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -5727,28 +5719,6 @@ static int __init cgroup_disable(char *s
+@@ -5773,28 +5765,6 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
 

target/linux/brcm2708/patches-4.19/950-0553-spi-bcm2835-enable-shared-interrupt-support.patch

@@ -23,7 +23,7 @@ Signed-off-by: Martin Sperl <[email protected]>
  	/* Read as many bytes as possible from FIFO */
  	bcm2835_rd_fifo(bs);
  	/* Write as many bytes as possible to FIFO */
-@@ -755,7 +759,8 @@ static int bcm2835_spi_probe(struct plat
+@@ -756,7 +760,8 @@ static int bcm2835_spi_probe(struct plat
  	bcm2835_wr(bs, BCM2835_SPI_CS,
  		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
 

target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch

@@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
 
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -1938,7 +1938,8 @@ int gpiochip_add_pingroup_range(struct g
+@@ -1940,7 +1940,8 @@ int gpiochip_add_pingroup_range(struct g
 
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
 
@@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  }
  EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);
 
-@@ -1990,7 +1991,7 @@ int gpiochip_add_pin_range(struct gpio_c
+@@ -1992,7 +1993,7 @@ int gpiochip_add_pin_range(struct gpio_c
 
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
 

target/linux/generic/backport-4.14/011-kbuild-export-SUBARCH.patch

@@ -10,9 +10,9 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -428,8 +428,8 @@ KBUILD_CFLAGS_MODULE  := -DMODULE
- KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
+@@ -429,8 +429,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s
  GCC_PLUGINS_CFLAGS :=
+ CLANG_FLAGS :=
 
 -export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
 -export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES

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

@@ -65,7 +65,7 @@ Cc: Kir Kolyshkin <[email protected]>
  	 * Before updating sk_refcnt, we must commit prior changes to memory
 --- a/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;
 
@@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <[email protected]>
  		    sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
 
  	/* 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;
 

target/linux/generic/backport-4.19/011-kbuild-export-SUBARCH.patch

@@ -10,9 +10,9 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -431,8 +431,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s
- KBUILD_LDFLAGS :=
+@@ -432,8 +432,8 @@ KBUILD_LDFLAGS :=
  GCC_PLUGINS_CFLAGS :=
+ CLANG_FLAGS :=
 
 -export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
 -export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS

target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch

@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -406,8 +406,8 @@ KERNELRELEASE = $(shell cat include/conf
+@@ -407,8 +407,8 @@ KERNELRELEASE = $(shell cat include/conf
  KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
 
  export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch

@@ -117,7 +117,7 @@ Signed-off-by: Masahiro Yamada <[email protected]>
 +
 --- a/include/linux/compiler.h
 +++ b/include/linux/compiler.h
-@@ -589,4 +589,23 @@ unsigned long read_word_at_a_time(const
+@@ -605,4 +605,23 @@ unsigned long read_word_at_a_time(const
  # define __kprobes
  # define nokprobe_inline	inline
  #endif

target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch

@@ -303,8 +303,8 @@ Signed-off-by: Linus Lüssing <[email protected]>
 +			if (!br_port_group_equal(p, port, src))
  				continue;
 
- 			rcu_assign_pointer(*pp, p->next);
-@@ -1517,7 +1555,7 @@ br_multicast_leave_group(struct net_brid
+ 			if (p->flags & MDB_PG_FLAGS_PERMANENT)
+@@ -1520,7 +1558,7 @@ br_multicast_leave_group(struct net_brid
  		for (p = mlock_dereference(mp->ports, br);
  		     p != NULL;
  		     p = mlock_dereference(p->next, br)) {
@@ -313,7 +313,7 @@ Signed-off-by: Linus Lüssing <[email protected]>
  				continue;
 
  			if (!hlist_unhashed(&p->mglist) &&
-@@ -1568,7 +1606,8 @@ out:
+@@ -1571,7 +1609,8 @@ out:
  static void br_ip4_multicast_leave_group(struct net_bridge *br,
  					 struct net_bridge_port *port,
  					 __be32 group,
@@ -323,7 +323,7 @@ Signed-off-by: Linus Lüssing <[email protected]>
  {
  	struct br_ip br_group;
  	struct bridge_mcast_own_query *own_query;
-@@ -1583,14 +1622,15 @@ static void br_ip4_multicast_leave_group
+@@ -1586,14 +1625,15 @@ static void br_ip4_multicast_leave_group
  	br_group.vid = vid;
 
  	br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
@@ -341,7 +341,7 @@ Signed-off-by: Linus Lüssing <[email protected]>
  {
  	struct br_ip br_group;
  	struct bridge_mcast_own_query *own_query;
-@@ -1605,7 +1645,7 @@ static void br_ip6_multicast_leave_group
+@@ -1608,7 +1648,7 @@ static void br_ip6_multicast_leave_group
  	br_group.vid = vid;
 
  	br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
@@ -350,15 +350,15 @@ Signed-off-by: Linus Lüssing <[email protected]>
  }
  #endif
 
-@@ -1648,6 +1688,7 @@ static int br_multicast_ipv4_rcv(struct
+@@ -1651,6 +1691,7 @@ static int br_multicast_ipv4_rcv(struct
  				 u16 vid)
  {
  	struct sk_buff *skb_trimmed = NULL;
 +	const unsigned char *src;
  	struct igmphdr *ih;
  	int err;
 
-@@ -1663,13 +1704,14 @@ static int br_multicast_ipv4_rcv(struct
+@@ -1666,13 +1707,14 @@ static int br_multicast_ipv4_rcv(struct
  	}
 
  	ih = igmp_hdr(skb);
@@ -374,7 +374,7 @@ Signed-off-by: Linus Lüssing <[email protected]>
  		break;
  	case IGMPV3_HOST_MEMBERSHIP_REPORT:
  		err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid);
-@@ -1678,7 +1720,7 @@ static int br_multicast_ipv4_rcv(struct
+@@ -1681,7 +1723,7 @@ static int br_multicast_ipv4_rcv(struct
  		err = br_ip4_multicast_query(br, port, skb_trimmed, vid);
  		break;
  	case IGMP_HOST_LEAVE_MESSAGE:
@@ -383,15 +383,15 @@ Signed-off-by: Linus Lüssing <[email protected]>
  		break;
  	}
 
-@@ -1698,6 +1740,7 @@ static int br_multicast_ipv6_rcv(struct
+@@ -1701,6 +1743,7 @@ static int br_multicast_ipv6_rcv(struct
  				 u16 vid)
  {
  	struct sk_buff *skb_trimmed = NULL;
 +	const unsigned char *src;
  	struct mld_msg *mld;
  	int err;
 
-@@ -1717,8 +1760,10 @@ static int br_multicast_ipv6_rcv(struct
+@@ -1720,8 +1763,10 @@ static int br_multicast_ipv6_rcv(struct
 
  	switch (mld->mld_type) {
  	case ICMPV6_MGM_REPORT:
@@ -403,7 +403,7 @@ Signed-off-by: Linus Lüssing <[email protected]>
  		break;
  	case ICMPV6_MLD2_REPORT:
  		err = br_ip6_multicast_mld2_report(br, port, skb_trimmed, vid);
-@@ -1727,7 +1772,8 @@ static int br_multicast_ipv6_rcv(struct
+@@ -1730,7 +1775,8 @@ static int br_multicast_ipv6_rcv(struct
  		err = br_ip6_multicast_query(br, port, skb_trimmed, vid);
  		break;
  	case ICMPV6_MGM_REDUCTION:

target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch

@@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		nval = cmpxchg(&tp->tsq_flags, oval, nval);
  		if (nval != oval)
  			continue;
-@@ -2226,6 +2226,8 @@ static bool tcp_write_xmit(struct sock *
+@@ -2235,6 +2235,8 @@ static bool tcp_write_xmit(struct sock *
  		    unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
  			break;
 

target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch

@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -2131,6 +2131,15 @@ static bool tcp_small_queue_check(struct
+@@ -2140,6 +2140,15 @@ static bool tcp_small_queue_check(struct
  	limit <<= factor;
 
  	if (atomic_read(&sk->sk_wmem_alloc) > limit) {

target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch

@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -1964,26 +1964,26 @@ static bool tcp_can_coalesce_send_queue_
+@@ -1973,26 +1973,26 @@ static bool tcp_can_coalesce_send_queue_
   */
  static int tcp_mtu_probe(struct sock *sk)
  {