--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
-@@ -175,6 +175,7 @@ source "drivers/net/ethernet/pensando/Kc
+@@ -176,6 +176,7 @@ source "drivers/net/ethernet/pensando/Kc
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/qualcomm/Kconfig"
source "drivers/net/ethernet/renesas/Kconfig"
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
-@@ -78,6 +78,7 @@ obj-$(CONFIG_NET_VENDOR_PACKET_ENGINES)
+@@ -79,6 +79,7 @@ obj-$(CONFIG_NET_VENDOR_PACKET_ENGINES)
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_QUALCOMM) += qualcomm/
}
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
-@@ -754,10 +754,15 @@ config EP93XX_TIMER
+@@ -765,10 +765,15 @@ config EP93XX_TIMER
help
Enables support for the Cirrus Logic timer block
EP93XX.
/*
* In order to reduce the possibility of kernel panic when failed to
-@@ -828,6 +827,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -825,6 +824,7 @@ void __init setup_arch(char **cmdline_p)
cpu_cache_init();
paging_init();
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -750,8 +750,10 @@ int setup_arg_pages(struct linux_binprm
+@@ -632,8 +632,10 @@ int setup_arg_pages(struct linux_binprm
mm->arg_start = bprm->p - stack_shift;
bprm->p = vma->vm_end - stack_shift;
#else
+};
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -1966,6 +1966,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
+@@ -1943,6 +1943,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
static const struct spi_nor_manufacturer *manufacturers[] = {
&spi_nor_atmel,
&spi_nor_everspin,
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
-@@ -580,6 +580,7 @@ struct sfdp {
+@@ -585,6 +585,7 @@ struct sfdp {
/* Manufacturer drivers. */
extern const struct spi_nor_manufacturer spi_nor_atmel;
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
-@@ -337,6 +337,14 @@ config MTD_NAND_QCOM
+@@ -311,6 +311,14 @@ config MTD_NAND_QCOM
Enables support for NAND flash chips on SoCs containing the EBI2 NAND
controller. This controller is found on IPQ806x SoC.
depends on MTD_NAND_ECC_MEDIATEK
--- a/drivers/mtd/nand/raw/Makefile
+++ b/drivers/mtd/nand/raw/Makefile
-@@ -47,6 +47,7 @@ obj-$(CONFIG_MTD_NAND_SUNXI) += sunxi_n
+@@ -46,6 +46,7 @@ obj-$(CONFIG_MTD_NAND_SUNXI) += sunxi_n
obj-$(CONFIG_MTD_NAND_HISI504) += hisi504_nand.o
obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmnand/
obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -295,7 +295,7 @@ static void phy_link_change(struct phy_d
+@@ -257,7 +257,7 @@ static void phy_link_change(struct phy_d
if (up)
netif_carrier_on(netdev);
if (phydev->mii_ts && phydev->mii_ts->link_state)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -685,6 +685,7 @@ struct phy_device {
+@@ -659,6 +659,7 @@ struct phy_device {
unsigned downshifted_rate:1;
unsigned is_on_sfp_module:1;
unsigned mac_managed_pm:1;
+ unsigned no_auto_carrier_off:1;
unsigned wol_enabled:1;
+ unsigned is_genphy_driven:1;
- unsigned autoneg:1;
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
-@@ -564,6 +564,12 @@ config PLX_DMA
- These are exposed via extra functions on the switch's
- upstream port. Each function exposes one DMA channel.
+@@ -580,6 +580,12 @@ config SOPHGO_CV1800B_DMAMUX
+ series SoCs.
+ Say Y here if your board have this soc.
+config RALINK_GDMA
+ tristate "RALINK GDMA support"
+obj-$(CONFIG_RALINK_GDMA) += ralink-gdma.o
obj-$(CONFIG_RENESAS_DMA) += sh/
obj-$(CONFIG_SF_PDMA) += sf-pdma/
- obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
+ obj-$(CONFIG_SOPHGO_CV1800B_DMAMUX) += cv1800b-dmamux.o
+};
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
-@@ -1062,6 +1062,11 @@ config I2C_RK3X
+@@ -1103,6 +1103,11 @@ config I2C_RTL9300
This driver can also be built as a module. If so, the module will
- be called i2c-rk3x.
+ be called i2c-rtl9300.
+config I2C_RALINK
+ tristate "Ralink I2C Controller"
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
-@@ -1090,6 +1090,8 @@ config MMC_OWL
+@@ -1129,6 +1129,8 @@ config MMC_LOONGSON2
config MMC_SDHCI_EXTERNAL_DMA
bool
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
-@@ -503,6 +503,9 @@ uart_get_baud_rate(struct uart_port *por
+@@ -501,6 +501,9 @@ uart_get_baud_rate(struct uart_port *por
break;
}
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
-@@ -604,6 +604,17 @@ config KEYBOARD_SUNKBD
+@@ -599,6 +599,17 @@ config KEYBOARD_SUNKBD
To compile this driver as a module, choose M here: the
module will be called sunkbd.