| Message ID | 1486172055-13162-2-git-send-email-baoyou.xie@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On 02/03/2017 05:34 PM, Baoyou Xie wrote: > Add the zx2967 watchdog controller driver as maintained by ARM ZTE > architecture maintainers, as they're parts of the core IP. > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> I assume you'll submit this patch through the arm tree ? Guenter > --- > MAINTAINERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index edfdea3..275c434 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1990,11 +1990,13 @@ F: drivers/clk/zte/ > F: drivers/reset/reset-zx2967.c > F: drivers/soc/zte/ > F: drivers/thermal/zx* > +F: drivers/watchdog/zx2967_wdt.c > F: Documentation/devicetree/bindings/arm/zte.txt > F: Documentation/devicetree/bindings/clock/zx296702-clk.txt > F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt > F: Documentation/devicetree/bindings/soc/zte/ > F: Documentation/devicetree/bindings/thermal/zx* > +F: Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt > F: include/dt-bindings/soc/zx*.h > > ARM/ZYNQ ARCHITECTURE > -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/04/2017 07:45 PM, Shawn Guo wrote: > Hi Baoyou, > > On Sun, Feb 05, 2017 at 10:36:38AM +0800, Baoyou Xie wrote: >> On 5 February 2017 at 08:05, Guenter Roeck <linux@roeck-us.net> wrote: >> >>> On 02/03/2017 05:34 PM, Baoyou Xie wrote: >>> >>>> Add the zx2967 watchdog controller driver as maintained by ARM ZTE >>>> architecture maintainers, as they're parts of the core IP. >>>> >>>> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> >>>> >>> >>> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >>> >>> I assume you'll submit this patch through the arm tree ? >>> >> Could you please submit all three patches through your tree? Thanks a lot >> :) > > Patch #2 is the only one that Guenter is concerned about, as there are > other subsystem related updates on the file. I think Guenter's > suggestion is good, i.e. we have patch #1 and #3 go upstream through > watchdog tree, and later we update MAINTAINERS as needed via arm-soc > tree. > Yes. One of the problems is that the patch doesn't apply to my tree (which is based on v4.10-rc3), and it doesn't have a common anchestor, meaning it is most likely not based on mainline. I would prefer to avoid conflicts with the arm tree if possible. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/MAINTAINERS b/MAINTAINERS index edfdea3..275c434 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1990,11 +1990,13 @@ F: drivers/clk/zte/ F: drivers/reset/reset-zx2967.c F: drivers/soc/zte/ F: drivers/thermal/zx* +F: drivers/watchdog/zx2967_wdt.c F: Documentation/devicetree/bindings/arm/zte.txt F: Documentation/devicetree/bindings/clock/zx296702-clk.txt F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt F: Documentation/devicetree/bindings/soc/zte/ F: Documentation/devicetree/bindings/thermal/zx* +F: Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt F: include/dt-bindings/soc/zx*.h ARM/ZYNQ ARCHITECTURE
Add the zx2967 watchdog controller driver as maintained by ARM ZTE architecture maintainers, as they're parts of the core IP. Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html