diff options
| author | John Audia <graysky@archlinux.us> | 2021-11-06 12:34:16 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-07 19:58:08 +0100 |
| commit | a50565157e61bb3e570b5b23dd6ff4c2e88ffee4 (patch) | |
| tree | 0f94d9f5b12a87798d587efb0a70e9c63dffcb07 /target/linux/ramips | |
| parent | 71af55ae2a9f5de71041936502c6a631349f33a7 (diff) | |
| download | upstream-a50565157e61bb3e570b5b23dd6ff4c2e88ffee4.tar.gz upstream-a50565157e61bb3e570b5b23dd6ff4c2e88ffee4.tar.bz2 upstream-a50565157e61bb3e570b5b23dd6ff4c2e88ffee4.zip | |
kernel: bump 5.4 to 5.4.158
All patches automatically rebased.
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch | 2 | ||||
| -rw-r--r-- | target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch b/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch index 3fbb0bf323..d5de4e45bc 100644 --- a/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch +++ b/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2305,6 +2305,11 @@ static const struct flash_info spi_nor_i +@@ -2306,6 +2306,11 @@ static const struct flash_info spi_nor_i SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) .fixups = &gd25q256_fixups, }, diff --git a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch index ae1293c951..8b95eacab1 100644 --- a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch +++ b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch @@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -547,7 +547,10 @@ static int phy_check_link_status(struct +@@ -549,7 +549,10 @@ static int phy_check_link_status(struct phy_link_up(phydev); } else if (!phydev->link && phydev->state != PHY_NOLINK) { phydev->state = PHY_NOLINK; @@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> } return 0; -@@ -927,7 +930,10 @@ void phy_state_machine(struct work_struc +@@ -947,7 +950,10 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; |