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

From: Sudeep Holla
Date: Tue Mar 08 2016 - 05:10:24 EST

On 07/03/16 19:00, Olof Johansson wrote:
On Mon, Mar 7, 2016 at 4:19 AM, Sudeep Holla <sudeep.holla@xxxxxxx> 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

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@xxxxxxxxxx and we'll pick it up
from there.

OK, will do that.