From 4a51f7b23b85d1d5427d62635753c169cedac7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Mon, 11 Feb 2019 13:49:56 +0100
Subject: [PATCH] patches: rebase mox support patch
---
.../wip/0004-mvebu-Basic-MoX-support.patch | 21 ++++++-------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
index 239db19fe..4aded51ea 100644
--- a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
+++ b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
@@ -1,4 +1,4 @@
-From c1beadb3617ad518545aed415dfa659b9cb57906 Mon Sep 17 00:00:00 2001
+From 11032b4e88404991fee149a056216fae54f25874 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 7 Mar 2018 17:10:32 +0100
Subject: [PATCH] mvebu: Basic MoX support
@@ -54,7 +54,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...e-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch} | 18 +-
...a-add-module-EEPROM-reading-support.patch} | 13 +-
...d-phy-remove-fixed_phy_update_state.patch} | 17 +-
- ...eprom-ethtool-access-into-netdev-co.patch} | 42 +-
+ ...eprom-ethtool-access-into-netdev-co.patch} | 40 +-
...p-use-netdev-sfp_bus-for-start-stop.patch} | 9 +-
...-marvell-10G-phy-support-to-use-SFP.patch} | 19 +-
...tch => 90047-sfp-add-sfp-compatible.patch} | 11 +-
@@ -141,7 +141,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...37xx-periph-Fix-wrong-return-value-.patch} | 0
...37xx-periph-Remove-unused-var-num_p.patch} | 0
...m64-restart-Armada-3700-restart-code.patch | 6 +-
- 134 files changed, 14316 insertions(+), 418 deletions(-)
+ 134 files changed, 14315 insertions(+), 417 deletions(-)
delete mode 100644 target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
delete mode 100644 target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch
create mode 100644 target/linux/mvebu/patches-4.14/90001-crypto-inside-secure-remove-null-check-before-kfree.patch
@@ -187,7 +187,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
rename target/linux/mvebu/patches-4.14/{405-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch => 90041-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch} (72%)
rename target/linux/mvebu/patches-4.14/{406-net-mvneta-add-module-EEPROM-reading-support.patch => 90042-net-mvneta-add-module-EEPROM-reading-support.patch} (74%)
rename target/linux/mvebu/patches-4.14/{407-phy-fixed-phy-remove-fixed_phy_update_state.patch => 90043-phy-fixed-phy-remove-fixed_phy_update_state.patch} (78%)
- rename target/linux/mvebu/patches-4.14/{408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch => 90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch} (76%)
+ rename target/linux/mvebu/patches-4.14/{408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch => 90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch} (77%)
rename target/linux/mvebu/patches-4.14/{409-sfp-use-netdev-sfp_bus-for-start-stop.patch => 90045-sfp-use-netdev-sfp_bus-for-start-stop.patch} (79%)
rename target/linux/mvebu/patches-4.14/{410-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch => 90046-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch} (85%)
rename target/linux/mvebu/patches-4.14/{411-sfp-add-sfp-compatible.patch => 90047-sfp-add-sfp-compatible.patch} (66%)
@@ -5203,10 +5203,10 @@ index 71c2f45555..1183a4a182 100644
+2.19.2
+
diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch b/target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
-similarity index 76%
+similarity index 77%
rename from target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
rename to target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
-index 224b976451..160a3782cb 100644
+index c31a540228..8397c2aa63 100644
--- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
+++ b/target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
@@ -1,21 +1,24 @@
@@ -5292,15 +5292,6 @@ index 224b976451..160a3782cb 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -57,6 +57,7 @@ struct device;
-@@ -129,7 +138,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
- /* 802.11 specific */
- struct wireless_dev;
- /* 802.15.4 specific */
--@@ -1932,6 +1933,7 @@ struct net_device {
-+@@ -1895,6 +1896,7 @@ struct net_device {
- struct netprio_map __rcu *priomap;
- #endif
- struct phy_device *phydev;
@@ -137,9 +146,11 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
struct lock_class_key *qdisc_tx_busylock;
struct lock_class_key *qdisc_running_key;
--
GitLab