From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751949AbdBEE3g (ORCPT ); Sat, 4 Feb 2017 23:29:36 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:42316 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbdBEE3e (ORCPT ); Sat, 4 Feb 2017 23:29:34 -0500 Subject: Re: [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture To: Shawn Guo , Baoyou Xie References: <1486172055-13162-1-git-send-email-baoyou.xie@linaro.org> <1486172055-13162-2-git-send-email-baoyou.xie@linaro.org> <4cba1be6-ee85-7371-ea02-1bf8e7eb628e@roeck-us.net> <20170205034504.GD3407@dragon> Cc: Jun Nie , wim@iguana.be, Rob Herring , Mark Rutland , Mathieu Poirier , linux-arm Mailing List , linux-watchdog@vger.kernel.org, devicetree , Linux Kernel Mailing List , "xie.baoyou" , chen.chaokai@zte.com.cn, wang.qiang01@zte.com.cn From: Guenter Roeck Message-ID: Date: Sat, 4 Feb 2017 20:29:27 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170205034504.GD3407@dragon> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 >>>> >>> >>> Reviewed-by: Guenter Roeck >>> >>> 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