linux-kernel - Re: linux-next: manual merge of the watchdog tree with the arm-soc tree

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:	Tue, 8 Mar 2016 23:03:57 +0700
From:	Fu Wei <fu.wei@...aro.org>
To:	André Przywara <andre.przywara@....com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Wim Van Sebroeck <wim@...ana.be>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	LKML <linux-kernel@...r.kernel.org>,
	Guenter Roeck <linux@...ck-us.net>,
	Sudeep Holla <sudeep.holla@....com>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm-soc tree

Hi All,

On 8 March 2016 at 22:52, André Przywara <andre.przywara@....com> wrote:
> On 07/03/16 11:04, Stephen Rothwell wrote:
>> Hi Wim,
>>
>> Today's linux-next merge of the watchdog tree got a conflict in:
>>
>>   arch/arm64/boot/dts/arm/foundation-v8.dts
>>
>> between commit:
>>
>>   d11a89796678 ("arm64: dts: split Foundation model dts to put the GIC separately")
>>
>> from the arm-soc tree and commit:
>>
>>   fe3a97e8ed02 ("ARM64: add SBSA Generic Watchdog device node in foundation-v8.dts")
>>
>> from the watchdog tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> But unfortunately this is the wrong solution. The watchdog DT node
> belongs into the (newly created) common foundation-v8.dtsi, not into the
> GICv2-only .dts.
> So whoever now provides the watchdog patch, can it be rebased on top of
> the foundation model .dts rework, so that the new node ends up in the
> .dtsi file?

I can rebase this patch to make a  watchdog DT patch for
foundation-v8.dtsi ASAP.

Thanks

> If this is too much hassle I could also send a fix after -rc1 (as the
> breakage is not really critical).
>
> Cheers,
> Andre.
>



-- 
Best regards,

Fu Wei
Software Engineer
Red Hat Software (Beijing) Co.,Ltd.Shanghai Branch
Ph: +86 21 61221326(direct)
Ph: +86 186 2020 4684 (mobile)
Room 1512, Regus One Corporate Avenue,Level 15,
One Corporate Avenue,222 Hubin Road,Huangpu District,
Shanghai,China 200021