linux-kernel - Re: [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 4 Feb 2017 20:29:27 -0800
From:   Guenter Roeck <linux@...ck-us.net>
To:     Shawn Guo <shawnguo@...nel.org>, Baoyou Xie <baoyou.xie@...aro.org>
Cc:     Jun Nie <jun.nie@...aro.org>, wim@...ana.be,
        Rob Herring <robh+dt@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        Mathieu Poirier <mathieu.poirier@...aro.org>,
        linux-arm Mailing List <linux-arm-kernel@...ts.infradead.org>,
        linux-watchdog@...r.kernel.org,
        devicetree <devicetree@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "xie.baoyou" <xie.baoyou@....com.cn>, chen.chaokai@....com.cn,
        wang.qiang01@....com.cn
Subject: Re: [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver
 to ARM ZTE architecture

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@...ck-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@...aro.org>
>>>>
>>>
>>> Reviewed-by: Guenter Roeck <linux@...ck-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