From: Zoltan HERPAI Date: Sat, 25 Nov 2017 12:39:20 +0000 (+0100) Subject: kernel: bump to 3.18.84 X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=6e7347388a072c6681ec77ac78d831b24f647511;p=15.05%2Fopenwrt.git kernel: bump to 3.18.84 Compile-tested: ar71xx, sunxi, mvebu, ramips/rt305x, lantiq Runtime-tested: ar71xx, sunxi Signed-off-by: Zoltan HERPAI --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index ee6f4dafbe..9a95ef398a 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,9 +2,9 @@ LINUX_RELEASE?=1 -LINUX_VERSION-3.18 = .80 +LINUX_VERSION-3.18 = .84 -LINUX_KERNEL_MD5SUM-3.18.80 = 5f2bba0500b3650fdaa0bf6e06062056 +LINUX_KERNEL_MD5SUM-3.18.84 = e79685de43fcf3c4ada7d4fc5230a518 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch b/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch index c5d4d3a57e..5390bd95b7 100644 --- a/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch +++ b/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch @@ -10,7 +10,7 @@ obj-$(CONFIG_PATA_SAMSUNG_CF) += pata_samsung_cf.o --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -955,6 +955,15 @@ config PATA_QDI +@@ -958,6 +958,15 @@ config PATA_QDI help Support for QDI 6500 and 6580 PATA controllers on VESA local bus. diff --git a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch index 8da26fd2ea..34767758d2 100644 --- a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch @@ -263,7 +263,7 @@ case IPV6_2292HOPOPTS: --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c -@@ -479,11 +479,11 @@ static int ip6gre_rcv(struct sk_buff *sk +@@ -482,11 +482,11 @@ static int ip6gre_rcv(struct sk_buff *sk offset += 4; } if (flags&GRE_KEY) { @@ -277,7 +277,7 @@ offset += 4; } } -@@ -748,7 +748,7 @@ static netdev_tx_t ip6gre_xmit2(struct s +@@ -751,7 +751,7 @@ static netdev_tx_t ip6gre_xmit2(struct s if (tunnel->parms.o_flags&GRE_SEQ) { ++tunnel->o_seqno; @@ -286,7 +286,7 @@ ptr--; } if (tunnel->parms.o_flags&GRE_KEY) { -@@ -844,7 +844,7 @@ static inline int ip6gre_xmit_ipv6(struc +@@ -847,7 +847,7 @@ static inline int ip6gre_xmit_ipv6(struc dsfield = ipv6_get_dsfield(ipv6h); if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS) diff --git a/target/linux/gemini/patches-3.18/150-gemini-pata.patch b/target/linux/gemini/patches-3.18/150-gemini-pata.patch index 62a71def76..2fb2be0c98 100644 --- a/target/linux/gemini/patches-3.18/150-gemini-pata.patch +++ b/target/linux/gemini/patches-3.18/150-gemini-pata.patch @@ -123,7 +123,7 @@ .length = SZ_512K, --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -536,6 +536,16 @@ config PATA_EP93XX +@@ -539,6 +539,16 @@ config PATA_EP93XX If unsure, say N. diff --git a/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch b/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch index 6b1721b3a8..78d677d94f 100644 --- a/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch +++ b/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch @@ -1,6 +1,6 @@ --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -1438,6 +1438,13 @@ config CRYPTO_LZ4HC +@@ -1437,6 +1437,13 @@ config CRYPTO_LZ4HC help This is the LZ4 high compression mode algorithm. diff --git a/target/linux/generic/patches-3.18/701-phy_extension.patch b/target/linux/generic/patches-3.18/701-phy_extension.patch index fa4542b88b..5c63dbec62 100644 --- a/target/linux/generic/patches-3.18/701-phy_extension.patch +++ b/target/linux/generic/patches-3.18/701-phy_extension.patch @@ -53,7 +53,7 @@ * @phydev: the phy_device struct --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -752,6 +752,7 @@ void phy_start_machine(struct phy_device +@@ -748,6 +748,7 @@ void phy_start_machine(struct phy_device void phy_stop_machine(struct phy_device *phydev); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); diff --git a/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch index d20fc04cb0..63040c0b40 100644 --- a/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch @@ -1,6 +1,6 @@ --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -484,6 +484,12 @@ struct phy_driver { +@@ -480,6 +480,12 @@ struct phy_driver { /* Determines the negotiated speed and duplex */ int (*read_status)(struct phy_device *phydev); diff --git a/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch index 061e40fb49..ca8e455833 100644 --- a/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -12,7 +12,7 @@ --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -502,6 +502,12 @@ struct phy_driver { +@@ -498,6 +498,12 @@ struct phy_driver { */ int (*did_interrupt)(struct phy_device *phydev); diff --git a/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch index 424c63e311..cc3cb2445d 100644 --- a/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch +++ b/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch @@ -46,7 +46,7 @@ phy_device_free(phydev); --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -789,4 +789,22 @@ int __init mdio_bus_init(void); +@@ -785,4 +785,22 @@ int __init mdio_bus_init(void); void mdio_bus_exit(void); extern struct bus_type mdio_bus_type; diff --git a/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch b/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch index 308eb9ac12..7cf94153e8 100644 --- a/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch +++ b/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch @@ -1,6 +1,6 @@ --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -1520,3 +1520,6 @@ source "drivers/crypto/Kconfig" +@@ -1519,3 +1519,6 @@ source "drivers/crypto/Kconfig" source crypto/asymmetric_keys/Kconfig endif # if CRYPTO diff --git a/target/linux/imx6/patches-3.18/203-net-igb-add-phy-read-write-functions-that-accept-phy.patch b/target/linux/imx6/patches-3.18/203-net-igb-add-phy-read-write-functions-that-accept-phy.patch index 405d4ec37f..0feb878835 100644 --- a/target/linux/imx6/patches-3.18/203-net-igb-add-phy-read-write-functions-that-accept-phy.patch +++ b/target/linux/imx6/patches-3.18/203-net-igb-add-phy-read-write-functions-that-accept-phy.patch @@ -16,7 +16,7 @@ Signed-off-by: Tim Harvey --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c -@@ -2129,7 +2129,7 @@ static s32 igb_read_phy_reg_82580(struct +@@ -2140,7 +2140,7 @@ static s32 igb_read_phy_reg_82580(struct if (ret_val) goto out; @@ -25,7 +25,7 @@ Signed-off-by: Tim Harvey hw->phy.ops.release(hw); -@@ -2154,7 +2154,7 @@ static s32 igb_write_phy_reg_82580(struc +@@ -2165,7 +2165,7 @@ static s32 igb_write_phy_reg_82580(struc if (ret_val) goto out; diff --git a/target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch b/target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch index 129a0bcbae..6ee3435260 100644 --- a/target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch +++ b/target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch @@ -23,7 +23,7 @@ Signed-off-by: Tim Harvey --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c -@@ -598,13 +598,25 @@ static s32 igb_get_invariants_82575(stru +@@ -609,13 +609,25 @@ static s32 igb_get_invariants_82575(stru switch (link_mode) { case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX: hw->phy.media_type = e1000_media_type_internal_serdes; @@ -49,7 +49,7 @@ Signed-off-by: Tim Harvey } /* fall through for I2C based SGMII */ case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES: -@@ -621,8 +633,11 @@ static s32 igb_get_invariants_82575(stru +@@ -632,8 +644,11 @@ static s32 igb_get_invariants_82575(stru hw->phy.media_type = e1000_media_type_copper; dev_spec->sgmii_active = true; } @@ -259,7 +259,7 @@ Signed-off-by: Tim Harvey /* start the watchdog. */ hw->mac.get_link_status = 1; schedule_work(&adapter->watchdog_task); -@@ -7111,21 +7249,41 @@ void igb_alloc_rx_buffers(struct igb_rin +@@ -7113,21 +7251,41 @@ void igb_alloc_rx_buffers(struct igb_rin static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) { struct igb_adapter *adapter = netdev_priv(netdev); diff --git a/target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch index 5943602adb..3089710ed2 100644 --- a/target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch +++ b/target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch @@ -43,7 +43,7 @@ Signed-off-by: John Crispin } --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -364,6 +364,7 @@ struct phy_device { +@@ -360,6 +360,7 @@ struct phy_device { bool is_c45; bool is_internal; bool has_fixups; diff --git a/target/linux/oxnas/patches-3.18/250-add-plxtech-vendor-prefix.patch b/target/linux/oxnas/patches-3.18/250-add-plxtech-vendor-prefix.patch index 1645c883d3..b06d44f9ce 100644 --- a/target/linux/oxnas/patches-3.18/250-add-plxtech-vendor-prefix.patch +++ b/target/linux/oxnas/patches-3.18/250-add-plxtech-vendor-prefix.patch @@ -1,6 +1,6 @@ --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -115,6 +115,7 @@ panasonic Panasonic Corporation +@@ -116,6 +116,7 @@ panasonic Panasonic Corporation phytec PHYTEC Messtechnik GmbH picochip Picochip Ltd plathome Plat'Home Co., Ltd. diff --git a/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch b/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch index af5e66ff03..68369040ab 100644 --- a/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch +++ b/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch @@ -1,6 +1,6 @@ --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -401,6 +401,13 @@ config SATA_VITESSE +@@ -404,6 +404,13 @@ config SATA_VITESSE If unsure, say N. diff --git a/target/linux/ramips/patches-3.18/0033-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.18/0033-NET-multi-phy-support.patch index f6d2456bad..8c62422684 100644 --- a/target/linux/ramips/patches-3.18/0033-NET-multi-phy-support.patch +++ b/target/linux/ramips/patches-3.18/0033-NET-multi-phy-support.patch @@ -43,7 +43,7 @@ Signed-off-by: John Crispin } --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -363,6 +363,7 @@ struct phy_device { +@@ -359,6 +359,7 @@ struct phy_device { struct phy_c45_device_ids c45_ids; bool is_c45; bool is_internal; diff --git a/target/linux/ramips/patches-3.18/0065-fix_dts_cache_issues.patch b/target/linux/ramips/patches-3.18/0065-fix_dts_cache_issues.patch index 520c570ee2..a8ea48057f 100644 --- a/target/linux/ramips/patches-3.18/0065-fix_dts_cache_issues.patch +++ b/target/linux/ramips/patches-3.18/0065-fix_dts_cache_issues.patch @@ -1,6 +1,6 @@ --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c -@@ -675,7 +675,6 @@ static void __init arch_mem_init(char ** +@@ -679,7 +679,6 @@ static void __init arch_mem_init(char ** crashk_res.end - crashk_res.start + 1, BOOTMEM_DEFAULT); #endif @@ -8,7 +8,7 @@ sparse_init(); plat_swiotlb_setup(); paging_init(); -@@ -784,6 +783,7 @@ void __init setup_arch(char **cmdline_p) +@@ -788,6 +787,7 @@ void __init setup_arch(char **cmdline_p) prefill_possible_map(); cpu_cache_init();