kernel: bump 4.14 to 4.14.167
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
parent
7a57e82f28
commit
76254cb75e
@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
|
|||||||
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINUX_VERSION-4.14 = .166
|
LINUX_VERSION-4.14 = .167
|
||||||
LINUX_VERSION-4.19 = .97
|
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
|
LINUX_KERNEL_HASH-4.19.97 = 8fb2a328e05e545274e721cf84baaf612b9330febc6f581b9ead81eaf41496da
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
|
@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
|
gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
|
||||||
if (IS_ERR(gpiod_reset))
|
if (IS_ERR(gpiod_reset))
|
||||||
return PTR_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.
|
* cannot recover from by software.
|
||||||
*/
|
*/
|
||||||
if (phydev->state == PHY_NOLINK) {
|
if (phydev->state == PHY_NOLINK) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/at803x.c
|
--- a/drivers/net/phy/at803x.c
|
||||||
+++ b/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)
|
static int at803x_aneg_done(struct phy_device *phydev)
|
||||||
{
|
{
|
||||||
@ -16,7 +16,7 @@
|
|||||||
/*
|
/*
|
||||||
* in SGMII mode, if copper side autoneg is successful,
|
* in SGMII mode, if copper side autoneg is successful,
|
||||||
* also check SGMII side autoneg result
|
* 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. */
|
/* check if the SGMII link is OK. */
|
||||||
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
|
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
|
||||||
pr_warn("803x_aneg_done: SGMII link is not ok\n");
|
pr_warn("803x_aneg_done: SGMII link is not ok\n");
|
||||||
|
@ -757,7 +757,7 @@
|
|||||||
EXPORT_SYMBOL(xfrm_parse_spi);
|
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||||
--- a/net/ipv4/tcp_input.c
|
--- a/net/ipv4/tcp_input.c
|
||||||
+++ b/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);
|
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
|||||||
|
|
||||||
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
||||||
+++ b/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
|
#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_RGMII_EN BIT(0)
|
||||||
#define QCA955X_ETH_CFG_MII_GE0 BIT(1)
|
#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_MASK 0x3
|
||||||
#define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20
|
#define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20
|
||||||
|
|
||||||
@ -88,4 +88,3 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
|||||||
/*
|
/*
|
||||||
* QCA956X GMAC Interface
|
* QCA956X GMAC Interface
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/at803x.c
|
--- a/drivers/net/phy/at803x.c
|
||||||
+++ b/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)) {
|
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
|
||||||
pr_warn("803x_aneg_done: SGMII link is not ok\n");
|
pr_warn("803x_aneg_done: SGMII link is not ok\n");
|
||||||
aneg_done = 0;
|
aneg_done = 0;
|
||||||
|
@ -737,7 +737,7 @@
|
|||||||
EXPORT_SYMBOL(xfrm_parse_spi);
|
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||||
--- a/net/ipv4/tcp_input.c
|
--- a/net/ipv4/tcp_input.c
|
||||||
+++ b/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);
|
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
|
|||||||
|
|
||||||
--- a/drivers/usb/serial/option.c
|
--- a/drivers/usb/serial/option.c
|
||||||
+++ b/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, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */
|
||||||
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
|
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
|
||||||
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },
|
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user