From 7f3dab2fc34e9b6c15d74ebf8e1d74ef601677e3 Mon Sep 17 00:00:00 2001 From: Etienne Haarsma Date: Sun, 26 Nov 2017 12:34:38 +0100 Subject: kernel: bump 4.4 to 4.4.102 Refreshed all patches. Removed upstream ramips patch: 0063-set-CM_GCR_BASE_CMDEFTGT_MEM-according-to-datasheet.patch Compile-tested: ar71xx Run-tested: ar71xx Signed-off-by: Etienne Haarsma Tested-by: Stijn Segers --- .../125-phy-provide-a-hook-for-link-up-link-down-events.patch | 2 +- .../patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch | 2 +- .../mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/mvebu/patches-4.4') diff --git a/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch b/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch index a27e6ba..0a0157b 100644 --- a/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch +++ b/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch @@ -173,7 +173,7 @@ Signed-off-by: Russell King --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -433,6 +433,7 @@ struct phy_device { +@@ -429,6 +429,7 @@ struct phy_device { u8 mdix; diff --git a/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch b/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch index 1b79259..c436070 100644 --- a/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch +++ b/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch @@ -34,7 +34,7 @@ Signed-off-by: Russell King case PHY_##_state: \ --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -816,6 +816,7 @@ int phy_ethtool_gset(struct phy_device * +@@ -812,6 +812,7 @@ int phy_ethtool_gset(struct phy_device * int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr); int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); int phy_start_interrupts(struct phy_device *phydev); diff --git a/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch b/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch index 0d340c8..141ea07 100644 --- a/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch +++ b/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch @@ -914,7 +914,7 @@ Signed-off-by: Russell King +MODULE_LICENSE("GPL"); --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -147,6 +147,7 @@ static inline const char *phy_modes(phy_ +@@ -143,6 +143,7 @@ static inline const char *phy_modes(phy_ #define MII_ADDR_C45 (1<<30) struct device; @@ -922,7 +922,7 @@ Signed-off-by: Russell King struct sk_buff; /* -@@ -429,6 +430,7 @@ struct phy_device { +@@ -425,6 +426,7 @@ struct phy_device { struct mutex lock; -- cgit v1.1