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 for Android: free password hash cracker in your pocket

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

Message-ID: <56DD71D6.8040406@arm.com>
Date:	Mon, 7 Mar 2016 12:19:34 +0000
From:	Sudeep Holla <sudeep.holla@....com>
To:	Olof Johansson <olof@...om.net>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Sudeep Holla <sudeep.holla@....com>,
	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

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.

-- 
Regards,
Sudeep