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]

Message-ID: <56DEA504.5070209@arm.com>
Date:	Tue, 8 Mar 2016 10:10:12 +0000
From:	Sudeep Holla <sudeep.holla@....com>
To:	Olof Johansson <olof@...om.net>
Cc:	Sudeep Holla <sudeep.holla@....com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	Wim Van Sebroeck <wim@...ana.be>,
	Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Fu Wei <fu.wei@...aro.org>, Guenter Roeck <linux@...ck-us.net>,
	Andre Przywara <andre.przywara@....com>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm-soc
 tree



On 07/03/16 19:00, Olof Johansson wrote:
> On Mon, Mar 7, 2016 at 4:19 AM, Sudeep Holla <sudeep.holla@....com> wrote:
>> Hi Olof,
>>
>> On 07/03/16 05:41, Olof Johansson wrote:
>>>
>>> Hi Wim,
>>>
>>> It's much easier for us if all DTS changes go in through the arm-soc
>>> trees, to avoid these kind of conflicts. Is this on a branch where you
>>> can easily drop it and we pick it up instead, or is it on a now-stable
>>> branch?
>>>
>>
>> Sorry for that. Since the patch series was still under discussion and
>> v14 was posted 3 days ago, I had not checked with Fu Wei on his plans
>> for DTS changes.
>>
>> Let me know if you want to pick up this single patch directly or want me
>> to send PR for that if Wim drops it from his branch. I might have couple
>> of DTS warning fixes for juno/vexpress(though I need to wait for Rob's
>> acks to them), so I can bundle them together.
>
> We're short on time for -rc7, most material should have been in by
> now. So you might want to send this separately if you think Rob will
> time out.
>

I agree, but the warnings I mentioned got introduced last Friday after
Rob updated DTC in -next.

> I'm OK with either applying directly or you bundling with other 64-bit
> DTS material. Either way, send to arm@...nel.org and we'll pick it up
> from there.
>

OK, will do that.

-- 
Regards,
Sudeep