From: Sudeep Holla <sudeep.holla@arm.com>
To: Olof Johansson <olof@lixom.net>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Wim Van Sebroeck <wim@iguana.be>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Fu Wei <fu.wei@linaro.org>, Guenter Roeck <linux@roeck-us.net>,
Andre Przywara <andre.przywara@arm.com>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm-soc tree
Date: Tue, 8 Mar 2016 10:10:12 +0000 [thread overview]
Message-ID: <56DEA504.5070209@arm.com> (raw)
In-Reply-To: <CAOesGMjrE3g0LBt_bJz8MZFS3REH1G5jC=Jv51V2upJXJo2VYQ@mail.gmail.com>
On 07/03/16 19:00, Olof Johansson wrote:
> On Mon, Mar 7, 2016 at 4:19 AM, Sudeep Holla <sudeep.holla@arm.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@kernel.org and we'll pick it up
> from there.
>
OK, will do that.
--
Regards,
Sudeep
WARNING: multiple messages have this Message-ID (diff)
From: sudeep.holla@arm.com (Sudeep Holla)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the watchdog tree with the arm-soc tree
Date: Tue, 8 Mar 2016 10:10:12 +0000 [thread overview]
Message-ID: <56DEA504.5070209@arm.com> (raw)
In-Reply-To: <CAOesGMjrE3g0LBt_bJz8MZFS3REH1G5jC=Jv51V2upJXJo2VYQ@mail.gmail.com>
On 07/03/16 19:00, Olof Johansson wrote:
> On Mon, Mar 7, 2016 at 4:19 AM, Sudeep Holla <sudeep.holla@arm.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 at kernel.org and we'll pick it up
> from there.
>
OK, will do that.
--
Regards,
Sudeep
next prev parent reply other threads:[~2016-03-08 10:10 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-07 4:04 linux-next: manual merge of the watchdog tree with the arm-soc tree Stephen Rothwell
2016-03-07 4:04 ` Stephen Rothwell
2016-03-07 4:04 ` Stephen Rothwell
2016-03-07 5:41 ` Olof Johansson
2016-03-07 5:41 ` Olof Johansson
2016-03-07 12:19 ` Sudeep Holla
2016-03-07 12:19 ` Sudeep Holla
2016-03-07 19:00 ` Olof Johansson
2016-03-07 19:00 ` Olof Johansson
2016-03-08 10:10 ` Sudeep Holla [this message]
2016-03-08 10:10 ` Sudeep Holla
2016-03-07 18:54 ` Wim Van Sebroeck
2016-03-07 19:00 ` Olof Johansson
2016-03-07 19:00 ` Olof Johansson
2016-03-08 15:52 ` André Przywara
2016-03-08 15:52 ` André Przywara
2016-03-08 16:03 ` Fu Wei
2016-03-08 16:03 ` Fu Wei
2016-03-08 16:55 ` Sudeep Holla
2016-03-08 16:55 ` Sudeep Holla
2016-03-08 16:06 ` Sudeep Holla
2016-03-08 16:06 ` Sudeep Holla
2016-03-08 16:07 ` André Przywara
2016-03-08 16:07 ` André Przywara
-- strict thread matches above, loose matches on Subject: below --
2017-09-11 0:58 Stephen Rothwell
2017-09-11 0:58 ` Stephen Rothwell
2014-03-03 5:38 Stephen Rothwell
2014-03-03 5:38 ` Stephen Rothwell
2014-03-03 5:38 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56DEA504.5070209@arm.com \
--to=sudeep.holla@arm.com \
--cc=andre.przywara@arm.com \
--cc=arnd@arndb.de \
--cc=fu.wei@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.