Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1353183
| From | Sudeep Holla <sudeep.holla@arm.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the watchdog tree with the arm-soc tree |
| Date | 2016-03-08 17:10 +0100 |
| Message-ID | <rasmS-37R-23@gated-at.bofh.it> (permalink) |
| References | <r9UEy-6fS-5@gated-at.bofh.it> <rasdc-2OP-9@gated-at.bofh.it> |
| Organization | ARM |
Hi Andre,
On 08/03/16 15:52, André Przywara 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?
> If this is too much hassle I could also send a fix after -rc1 (as the
> breakage is not really critical).
>
I have rebased it on top of my earlier PR and sending it shortly.
I have moved it to dtsi file.
--
Regards,
Sudeep
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the watchdog tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-07 05:10 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Olof Johansson <olof@lixom.net> - 2016-03-07 06:50 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Sudeep Holla <sudeep.holla@arm.com> - 2016-03-07 13:20 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Olof Johansson <olof@lixom.net> - 2016-03-07 20:10 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Sudeep Holla <sudeep.holla@arm.com> - 2016-03-08 11:20 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Wim Van Sebroeck <wim@iguana.be> - 2016-03-07 20:00 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Olof Johansson <olof@lixom.net> - 2016-03-07 20:10 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree André Przywara <andre.przywara@arm.com> - 2016-03-08 17:00 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Fu Wei <fu.wei@linaro.org> - 2016-03-08 17:10 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Sudeep Holla <sudeep.holla@arm.com> - 2016-03-08 18:00 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree Sudeep Holla <sudeep.holla@arm.com> - 2016-03-08 17:10 +0100
Re: linux-next: manual merge of the watchdog tree with the arm-soc tree André Przywara <andre.przywara@arm.com> - 2016-03-08 17:20 +0100
csiph-web