aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2017-02-01 17:02:21 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2017-02-06 20:13:06 +0100
commitb786a5ffc39539d55cf74ebd43edde9051b4682d (patch)
treef2b23f4b447ffc2b1b8539d010d6efb9ad08b02d
parentc656cbc56bba7ab0b2cfd8d850707bc60b7f6efe (diff)
downloadupstream-b786a5ffc39539d55cf74ebd43edde9051b4682d.tar.gz
upstream-b786a5ffc39539d55cf74ebd43edde9051b4682d.tar.bz2
upstream-b786a5ffc39539d55cf74ebd43edde9051b4682d.zip
kernel: bump to 4.4.46
Refreshed patches for all supported targets. Compile-tested on ar71xx, cns3xxx, imx6, mt7621, oxnas and x86/64. Run-tested on ar71xx, cns3xxx, imx6 and mt7621. Tested-by: Stijn Segers <francesco.borromini@inventati.org> Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> (cherry picked from commit 3becadd56cddfb8abff50cdb0ef1cb3f90b0809a) Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index b1452524f4..e06841dbad 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,10 +3,10 @@
LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .43
-LINUX_VERSION-4.4 = .45
+LINUX_VERSION-4.4 = .46
LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
-LINUX_KERNEL_HASH-4.4.45 = 22fb59247746a3dd109df6d1485a9972382507a3c0040ac33371b3fd2a021741
+LINUX_KERNEL_HASH-4.4.46 = bb944846c5901aa2cadaa20c3d953ec03ff707dc1178e6ac3851e98747872058
ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git a/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch b/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch
index 0d8ff5997b..c3f53874f9 100644
--- a/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch
+++ b/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
-@@ -362,6 +362,11 @@ static int bcm5481_config_aneg(struct ph
+@@ -382,6 +382,11 @@ static int bcm5481_config_aneg(struct ph
/* Write bits 14:0. */
reg |= (1 << 15);
phy_write(phydev, 0x18, reg);