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: Mon, 7 Mar 2016 12:19:34 +0000 [thread overview]
Message-ID: <56DD71D6.8040406@arm.com> (raw)
In-Reply-To: <CAOesGMjD51rNqd3V8BE6xHkYZQdB8nc_Azppk1U+m8GwrtUv6w@mail.gmail.com>
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
next prev parent reply other threads:[~2016-03-07 12:19 UTC|newest]
Thread overview: 13+ 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 5:41 ` Olof Johansson
2016-03-07 12:19 ` Sudeep Holla [this message]
2016-03-07 19:00 ` Olof Johansson
2016-03-08 10:10 ` Sudeep Holla
[not found] ` <20160307185449.GB16667@spo001.leaseweb.nl>
2016-03-07 19:00 ` Olof Johansson
2016-03-08 15:52 ` André Przywara
2016-03-08 16:03 ` Fu Wei
2016-03-08 16:55 ` Sudeep Holla
2016-03-08 16:06 ` Sudeep Holla
2016-03-08 16:07 ` André Przywara
-- strict thread matches above, loose matches on Subject: below --
2017-09-11 0:58 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=56DD71D6.8040406@arm.com \
--to=sudeep.holla@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).