kernel: bump 4.14 to 4.14.167
authorKoen Vandeputte <koen.vandeputte@ncentric.com>
Fri, 24 Jan 2020 10:13:35 +0000 (11:13 +0100)
committerKoen Vandeputte <koen.vandeputte@ncentric.com>
Fri, 24 Jan 2020 12:14:33 +0000 (13:14 +0100)
Refreshed all patches.

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch
target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch
target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch
target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch

index c4186b8d3ea60ac0300b8a39a6de09ba3e1425e8..71c2ae7c6d69c390f005f0576a71b6f76e78a493 100644 (file)
@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.14 = .166
+LINUX_VERSION-4.14 = .167
 LINUX_VERSION-4.19 = .97
 
-LINUX_KERNEL_HASH-4.14.166 = 8bb2bf811a2092933a2386a4e679cd0c88de979c10fbb463d8142add4e577c00
+LINUX_KERNEL_HASH-4.14.167 = 2bb78fc7a902faf4f5dad47fdbc2f4bf3df3cf9b41f408e7260f36656659fe43
 LINUX_KERNEL_HASH-4.19.97 = 8fb2a328e05e545274e721cf84baaf612b9330febc6f581b9ead81eaf41496da
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
index 81de68c9cbabd31c83ba858d8f1ba928d5e5d3c9..e4e51963bbe84ede04845cd9fba3295973bd2aa4 100644 (file)
@@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
        if (IS_ERR(gpiod_reset))
                return PTR_ERR(gpiod_reset);
-@@ -411,15 +418,23 @@ static void at803x_link_change_notify(st
+@@ -402,15 +409,23 @@ static void at803x_link_change_notify(st
         * cannot recover from by software.
         */
        if (phydev->state == PHY_NOLINK) {
index 8948fd495478d4c32a20601fe7132f2a43467ece..600f8ff6debd85d3c16b71776b66883ee864bde0 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
-@@ -478,12 +478,15 @@ static void at803x_link_change_notify(st
+@@ -458,12 +458,15 @@ static void at803x_link_change_notify(st
  
  static int at803x_aneg_done(struct phy_device *phydev)
  {
@@ -16,7 +16,7 @@
        /*
         * in SGMII mode, if copper side autoneg is successful,
         * also check SGMII side autoneg result
-@@ -498,7 +501,8 @@ static int at803x_aneg_done(struct phy_d
+@@ -478,7 +481,8 @@ static int at803x_aneg_done(struct phy_d
        /* check if the SGMII link is OK. */
        if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
                pr_warn("803x_aneg_done: SGMII link is not ok\n");
index d1dd056f765370726348897e5277626ba02727fd..f2732ebb20bacc82561cce1ee3251eb85087fb9a 100644 (file)
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3877,14 +3877,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3878,14 +3878,16 @@ static bool tcp_parse_aligned_timestamp(
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  
index 111c1553d3ad02155ec3ec020d9934a299e7986c..dc0af2fe9cc67af913dcce848d9422c696adad59 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -1245,7 +1245,12 @@
+@@ -1249,7 +1249,12 @@
   */
  
  #define QCA955X_GMAC_REG_ETH_CFG      0x00
@@ -29,7 +29,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  
  #define QCA955X_ETH_CFG_RGMII_EN      BIT(0)
  #define QCA955X_ETH_CFG_MII_GE0               BIT(1)
-@@ -1267,9 +1272,58 @@
+@@ -1271,9 +1276,58 @@
  #define QCA955X_ETH_CFG_TXE_DELAY_MASK        0x3
  #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT       20
  
@@ -88,4 +88,3 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  /*
   * QCA956X GMAC Interface
   */
-
index b0a1942b7a7e5c7e07976137e1728050156e93e8..3b302dcd9ed3b28ff2d41210e7494c49260c57f8 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
-@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d
+@@ -472,6 +472,13 @@ static int at803x_aneg_done(struct phy_d
        if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
                pr_warn("803x_aneg_done: SGMII link is not ok\n");
                aneg_done = 0;
index 29455b89077366a3ac3ef3971748c7ad0515cd98..6234ba4703429110cee89553c17a91a8a7b8254b 100644 (file)
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3877,14 +3877,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3878,14 +3878,16 @@ static bool tcp_parse_aligned_timestamp(
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  
index f70cfef7624737d83c392e5a0d1cce9ff4c6d2df..c09a5e47f81894adf31d6d8b759b72660e54730b 100644 (file)
@@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
 
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -1975,7 +1975,8 @@ static const struct usb_device_id option
+@@ -1981,7 +1981,8 @@ static const struct usb_device_id option
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },                   /* D-Link DWM-156 (variant) */
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },