aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-4.1
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-10-04 11:34:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-10-04 11:34:39 +0000
commit0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 (patch)
treed0a1a756d8b4469d550ffbd17f0c7dd8300ecb82 /target/linux/ipq806x/patches-4.1
parentdea417017edc6717e2662ab97b0af3d0b724d360 (diff)
downloadupstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.gz
upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.bz2
upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.zip
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
Diffstat (limited to 'target/linux/ipq806x/patches-4.1')
-rw-r--r--target/linux/ipq806x/patches-4.1/037-mtd-add-SMEM-parser-for-QCOM-platforms.patch2
-rw-r--r--target/linux/ipq806x/patches-4.1/701-stmmac-add-phy-handle-support-to-the-platform-layer.patch2
-rw-r--r--target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ipq806x/patches-4.1/037-mtd-add-SMEM-parser-for-QCOM-platforms.patch b/target/linux/ipq806x/patches-4.1/037-mtd-add-SMEM-parser-for-QCOM-platforms.patch
index b2c8cd5c53..5fc54134de 100644
--- a/target/linux/ipq806x/patches-4.1/037-mtd-add-SMEM-parser-for-QCOM-platforms.patch
+++ b/target/linux/ipq806x/patches-4.1/037-mtd-add-SMEM-parser-for-QCOM-platforms.patch
@@ -17,7 +17,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -200,6 +200,13 @@ config MTD_MYLOADER_PARTS
+@@ -195,6 +195,13 @@ 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.
diff --git a/target/linux/ipq806x/patches-4.1/701-stmmac-add-phy-handle-support-to-the-platform-layer.patch b/target/linux/ipq806x/patches-4.1/701-stmmac-add-phy-handle-support-to-the-platform-layer.patch
index 3711e1282b..5c29887248 100644
--- a/target/linux/ipq806x/patches-4.1/701-stmmac-add-phy-handle-support-to-the-platform-layer.patch
+++ b/target/linux/ipq806x/patches-4.1/701-stmmac-add-phy-handle-support-to-the-platform-layer.patch
@@ -63,7 +63,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
+ interface);
+ }
- if (IS_ERR(phydev)) {
+ if (IS_ERR_OR_NULL(phydev)) {
pr_err("%s: Could not attach to PHY\n", dev->name);
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
diff --git a/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch b/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch
index a05875bca5..f2305ac5aa 100644
--- a/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch
+++ b/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch
@@ -18,7 +18,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -856,7 +856,7 @@ static int stmmac_init_phy(struct net_de
+@@ -859,7 +859,7 @@ static int stmmac_init_phy(struct net_de
* device as well.
* Note: phydev->phy_id is the result of reading the UID PHY registers.
*/