From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751145AbdAPOjA (ORCPT ); Mon, 16 Jan 2017 09:39:00 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:48175 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751070AbdAPOi6 (ORCPT ); Mon, 16 Jan 2017 09:38:58 -0500 Message-ID: <1484577528.8415.147.camel@pengutronix.de> Subject: Re: [PATCH v2 2/3] MAINTAINERS: add zx2967 reset controller driver to ARM ZTE architecture From: Philipp Zabel To: Baoyou Xie Cc: jun.nie@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, xie.baoyou@zte.com.cn, chen.chaokai@zte.com.cn, wang.qiang01@zte.com.cn Date: Mon, 16 Jan 2017 15:38:48 +0100 In-Reply-To: <1484564194-18530-2-git-send-email-baoyou.xie@linaro.org> References: <1484564194-18530-1-git-send-email-baoyou.xie@linaro.org> <1484564194-18530-2-git-send-email-baoyou.xie@linaro.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2017-01-16 at 18:56 +0800, Baoyou Xie wrote: > Add the zx2967 reset controller driver as maintained by ARM ZTE > architecture maintainers, as they're parts of the core IP. > > Signed-off-by: Baoyou Xie > --- > MAINTAINERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 2793808..08f8155 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1980,10 +1980,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > F: arch/arm/mach-zx/ > F: drivers/clk/zte/ > +F: drivers/reset/reset-zx2967.c > F: drivers/soc/zte/ > F: drivers/thermal/zx* > 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: include/dt-bindings/soc/zx*.h This patch doesn't apply on top of reset/next. I can rebase it, but it will cause a trivial merge conflict with the soc/thermal additions. regards Philipp