CI reported that patches need to be refreshed, so lets refresh.
Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19650,12 +19650,13 @@ M: Emil Renner Berthing <kernel@esmil.dk
+@@ -19657,12 +19657,13 @@ M: Emil Renner Berthing <kernel@esmil.dk
S: Maintained
F: arch/riscv/boot/dts/starfive/
STARFIVE JH7100 PINCTRL DRIVER
M: Emil Renner Berthing <kernel@esmil.dk>
-@@ -19665,12 +19666,13 @@ F: Documentation/devicetree/bindings/pin
+@@ -19672,12 +19673,13 @@ F: Documentation/devicetree/bindings/pin
F: drivers/pinctrl/starfive/
F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
+...
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19658,13 +19658,15 @@ F: Documentation/devicetree/bindings/clo
+@@ -19665,13 +19665,15 @@ F: Documentation/devicetree/bindings/clo
F: drivers/clk/starfive/clk-starfive-jh71*
F: include/dt-bindings/clock/starfive?jh71*.h
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19664,7 +19664,7 @@ M: Jianlong Huang <jianlong.huang@starfi
+@@ -19671,7 +19671,7 @@ M: Jianlong Huang <jianlong.huang@starfi
L: linux-gpio@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19650,6 +19650,12 @@ M: Emil Renner Berthing <kernel@esmil.dk
+@@ -19657,6 +19657,12 @@ M: Emil Renner Berthing <kernel@esmil.dk
S: Maintained
F: arch/riscv/boot/dts/starfive/
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19682,6 +19682,20 @@ F: Documentation/devicetree/bindings/res
+@@ -19689,6 +19689,20 @@ F: Documentation/devicetree/bindings/res
F: drivers/reset/starfive/reset-starfive-jh71*
F: include/dt-bindings/reset/starfive?jh71*.h
+...
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19656,6 +19656,11 @@ S: Supported
+@@ -19663,6 +19663,11 @@ S: Supported
F: Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml
F: drivers/clk/starfive/clk-starfive-jh7110-pll.*
STARFIVE JH71X0 CLOCK DRIVERS
M: Emil Renner Berthing <kernel@esmil.dk>
M: Hal Feng <hal.feng@starfivetech.com>
-@@ -19686,6 +19691,7 @@ STARFIVE SOC DRIVER
+@@ -19693,6 +19698,7 @@ STARFIVE SOC DRIVER
M: Conor Dooley <conor@kernel.org>
S: Maintained
T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+ };
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19650,6 +19650,12 @@ M: Emil Renner Berthing <kernel@esmil.dk
+@@ -19657,6 +19657,12 @@ M: Emil Renner Berthing <kernel@esmil.dk
S: Maintained
F: arch/riscv/boot/dts/starfive/
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19655,6 +19655,7 @@ M: Emil Renner Berthing <kernel@esmil.dk
+@@ -19662,6 +19662,7 @@ M: Emil Renner Berthing <kernel@esmil.dk
M: Samin Guo <samin.guo@starfivetech.com>
S: Maintained
F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19709,6 +19709,12 @@ F: Documentation/devicetree/bindings/pow
+@@ -19716,6 +19716,12 @@ F: Documentation/devicetree/bindings/pow
F: drivers/soc/starfive/jh71xx_pmu.c
F: include/dt-bindings/power/starfive,jh7110-pmu.h
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19715,6 +19715,13 @@ S: Supported
+@@ -19722,6 +19722,13 @@ S: Supported
F: Documentation/devicetree/bindings/rng/starfive*
F: drivers/char/hw_random/starfive-trng.c
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19657,6 +19657,12 @@ S: Maintained
+@@ -19664,6 +19664,12 @@ S: Maintained
F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
F: drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+================ ==== =============================================
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -18679,6 +18679,14 @@ L: netdev@vger.kernel.org
+@@ -18686,6 +18686,14 @@ L: netdev@vger.kernel.org
S: Supported
F: drivers/net/ethernet/sfc/
#endif
--- a/arch/riscv/kernel/Makefile
+++ b/arch/riscv/kernel/Makefile
-@@ -65,6 +65,7 @@ obj-$(CONFIG_MODULES) += module.o
+@@ -67,6 +67,7 @@ obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_MODULE_SECTIONS) += module-sections.o
obj-$(CONFIG_CPU_PM) += suspend_entry.o suspend.o
if (priv->dma_cap.host_dma_width <= 32)
gfp |= GFP_DMA32;
-@@ -4613,7 +4613,7 @@ static inline void stmmac_rx_refill(stru
+@@ -4615,7 +4615,7 @@ static inline void stmmac_rx_refill(stru
struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue];
int dirty = stmmac_rx_dirty(priv, queue);
unsigned int entry = rx_q->dirty_rx;
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -19704,7 +19704,7 @@ STARFIVE JH71X0 RESET CONTROLLER DRIVERS
+@@ -19711,7 +19711,7 @@ STARFIVE JH71X0 RESET CONTROLLER DRIVERS
M: Emil Renner Berthing <kernel@esmil.dk>
M: Hal Feng <hal.feng@starfivetech.com>
S: Maintained