kernel: clean up patch fuzz
Recent kernel bumps & target patch refactors have left some patch fuzz around. Refreshed kernel patches using update_kernel script. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
Index: linux-5.4.77/arch/mips/Kbuild.platforms
|
||||
===================================================================
|
||||
--- linux-5.4.77.orig/arch/mips/Kbuild.platforms
|
||||
+++ linux-5.4.77/arch/mips/Kbuild.platforms
|
||||
--- a/arch/mips/Kbuild.platforms
|
||||
+++ b/arch/mips/Kbuild.platforms
|
||||
@@ -27,6 +27,7 @@ platforms += pistachio
|
||||
platforms += pmcs-msp71xx
|
||||
platforms += pnx833x
|
||||
@@ -10,10 +8,8 @@ Index: linux-5.4.77/arch/mips/Kbuild.platforms
|
||||
platforms += rb532
|
||||
platforms += sgi-ip22
|
||||
platforms += sgi-ip27
|
||||
Index: linux-5.4.77/arch/mips/Kconfig
|
||||
===================================================================
|
||||
--- linux-5.4.77.orig/arch/mips/Kconfig
|
||||
+++ linux-5.4.77/arch/mips/Kconfig
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -630,6 +630,26 @@ config RALINK
|
||||
select ARCH_HAS_RESET_CONTROLLER
|
||||
select RESET_CONTROLLER
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-5.4.77/drivers/net/dsa/Kconfig
|
||||
===================================================================
|
||||
--- linux-5.4.77.orig/drivers/net/dsa/Kconfig
|
||||
+++ linux-5.4.77/drivers/net/dsa/Kconfig
|
||||
--- a/drivers/net/dsa/Kconfig
|
||||
+++ b/drivers/net/dsa/Kconfig
|
||||
@@ -63,6 +63,8 @@ config NET_DSA_QCA8K
|
||||
This enables support for the Qualcomm Atheros QCA8K Ethernet
|
||||
switch chips.
|
||||
@@ -11,10 +9,8 @@ Index: linux-5.4.77/drivers/net/dsa/Kconfig
|
||||
config NET_DSA_REALTEK_SMI
|
||||
tristate "Realtek SMI Ethernet switch family support"
|
||||
depends on NET_DSA
|
||||
Index: linux-5.4.77/drivers/net/dsa/Makefile
|
||||
===================================================================
|
||||
--- linux-5.4.77.orig/drivers/net/dsa/Makefile
|
||||
+++ linux-5.4.77/drivers/net/dsa/Makefile
|
||||
--- a/drivers/net/dsa/Makefile
|
||||
+++ b/drivers/net/dsa/Makefile
|
||||
@@ -21,3 +21,4 @@ obj-y += b53/
|
||||
obj-y += microchip/
|
||||
obj-y += mv88e6xxx/
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-5.4.77/net/dsa/tag_trailer.c
|
||||
===================================================================
|
||||
--- linux-5.4.77.orig/net/dsa/tag_trailer.c
|
||||
+++ linux-5.4.77/net/dsa/tag_trailer.c
|
||||
--- a/net/dsa/tag_trailer.c
|
||||
+++ b/net/dsa/tag_trailer.c
|
||||
@@ -44,7 +44,12 @@ static struct sk_buff *trailer_xmit(stru
|
||||
|
||||
trailer = skb_put(nskb, 4);
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-5.4.77/drivers/net/phy/Makefile
|
||||
===================================================================
|
||||
--- linux-5.4.77.orig/drivers/net/phy/Makefile
|
||||
+++ linux-5.4.77/drivers/net/phy/Makefile
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -101,7 +101,7 @@ obj-$(CONFIG_MICROSEMI_PHY) += mscc.o
|
||||
obj-$(CONFIG_NATIONAL_PHY) += national.o
|
||||
obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -188,7 +188,7 @@
|
||||
@@ -188,7 +188,7 @@ static inline const char *phy_modes(phy_
|
||||
#define PHY_INIT_TIMEOUT 100000
|
||||
#define PHY_FORCE_TIMEOUT 10
|
||||
|
||||
|
||||
Reference in New Issue
Block a user