kernel: bump 4.9 to 4.9.146

Refreshed all patches.

Compile-tested on: brcm2708
Runtime-tested on: brcm2708

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Koen Vandeputte 2018-12-18 13:00:03 +01:00
parent 902a9f23d6
commit dd0a213bed
5 changed files with 8 additions and 7 deletions

View File

@ -3,12 +3,12 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .130 LINUX_VERSION-3.18 = .130
LINUX_VERSION-4.9 = .145 LINUX_VERSION-4.9 = .146
LINUX_VERSION-4.14 = .88 LINUX_VERSION-4.14 = .88
LINUX_VERSION-4.19 = .9 LINUX_VERSION-4.19 = .9
LINUX_KERNEL_HASH-3.18.130 = d1bf85ed3fd0067b1134178ed5492ae0053cb3fdd5361986fe0b85234fc82723 LINUX_KERNEL_HASH-3.18.130 = d1bf85ed3fd0067b1134178ed5492ae0053cb3fdd5361986fe0b85234fc82723
LINUX_KERNEL_HASH-4.9.145 = 6901ca37e8c305a2f26c598952338b4dc2481ca5a9d0bf71e2b71730a5b5bc5e LINUX_KERNEL_HASH-4.9.146 = 58195a8be3085d117c83a2ed1caa3b46ea7c1614c75f951b9f13f7adb03f8e59
LINUX_KERNEL_HASH-4.14.88 = b0f0b8c76708eab6caf3009702e531d40a243b152922ee1f9a441316f226f52d LINUX_KERNEL_HASH-4.14.88 = b0f0b8c76708eab6caf3009702e531d40a243b152922ee1f9a441316f226f52d
LINUX_KERNEL_HASH-4.19.9 = fc116cc6829c73944215d3b3ac0fc368dde9e8235b456744afffde001269dbf2 LINUX_KERNEL_HASH-4.19.9 = fc116cc6829c73944215d3b3ac0fc368dde9e8235b456744afffde001269dbf2

View File

@ -89,12 +89,13 @@ See: https://github.com/raspberrypi/linux/issues/1064
depends on LEDS_TRIGGERS depends on LEDS_TRIGGERS
--- a/drivers/leds/trigger/Makefile --- a/drivers/leds/trigger/Makefile
+++ b/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_LEDS_TRIGGER_CPU) += ledtr @@ -9,5 +9,6 @@ obj-$(CONFIG_LEDS_TRIGGER_CPU) += ledtr
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o
obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o
+obj-$(CONFIG_LEDS_TRIGGER_INPUT) += ledtrig-input.o +obj-$(CONFIG_LEDS_TRIGGER_INPUT) += ledtrig-input.o
obj-$(CONFIG_LEDS_TRIGGER_PANIC) += ledtrig-panic.o obj-$(CONFIG_LEDS_TRIGGER_PANIC) += ledtrig-panic.o
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
--- /dev/null --- /dev/null
+++ b/drivers/leds/trigger/ledtrig-input.c +++ b/drivers/leds/trigger/ledtrig-input.c
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@

View File

@ -134,7 +134,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (tcp_small_queue_check(sk, skb, 0)) if (tcp_small_queue_check(sk, skb, 0))
break; break;
@@ -3542,8 +3542,6 @@ void __tcp_send_ack(struct sock *sk, u32 @@ -3546,8 +3546,6 @@ void __tcp_send_ack(struct sock *sk, u32
/* We do not want pure acks influencing TCP Small Queues or fq/pacing /* We do not want pure acks influencing TCP Small Queues or fq/pacing
* too much. * too much.
* SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784 * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784

View File

@ -1370,7 +1370,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
&queue_tx_maxrate.attr, &queue_tx_maxrate.attr,
--- a/net/core/rtnetlink.c --- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c
@@ -3706,7 +3706,7 @@ static int rtnl_get_offload_stats(struct @@ -3709,7 +3709,7 @@ static int rtnl_get_offload_stats(struct
if (!size) if (!size)
continue; continue;
@ -1379,7 +1379,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
continue; continue;
attr = nla_reserve_64bit(skb, attr_id, size, attr = nla_reserve_64bit(skb, attr_id, size,
@@ -3747,7 +3747,7 @@ static int rtnl_get_offload_stats_size(c @@ -3750,7 +3750,7 @@ static int rtnl_get_offload_stats_size(c
for (attr_id = IFLA_OFFLOAD_XSTATS_FIRST; for (attr_id = IFLA_OFFLOAD_XSTATS_FIRST;
attr_id <= IFLA_OFFLOAD_XSTATS_MAX; attr_id++) { attr_id <= IFLA_OFFLOAD_XSTATS_MAX; attr_id++) {

View File

@ -1713,7 +1713,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ret = phydrv->resume(phydev); ret = phydrv->resume(phydev);
if (ret) if (ret)
@@ -1723,7 +1723,7 @@ static int phy_remove(struct device *dev @@ -1720,7 +1720,7 @@ static int phy_remove(struct device *dev
phydev->state = PHY_DOWN; phydev->state = PHY_DOWN;
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);