From: Takashi Iwai <tiwai@suse.de>
To: Rob Herring <robh@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the pm tree
Date: Tue, 04 Jul 2017 18:09:17 +0200 [thread overview]
Message-ID: <s5hr2xwdw0i.wl-tiwai@suse.de> (raw)
In-Reply-To: <CAL_Jsq+bGVONzeRZ-wQ2UGARe537SLe1kqSxPYVQwwXneK3m9g@mail.gmail.com>
On Tue, 04 Jul 2017 18:00:30 +0200,
Rob Herring wrote:
>
> On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai <tiwai@suse.de> wrote:
> > On Mon, 03 Jul 2017 04:55:24 +0200,
> > Stephen Rothwell wrote:
> >>
> >> Hi all,
> >>
> >> [cc-ing the sound tree maintainer]
> >
> > Thanks.
> >
> >> With the merge window opening, just a reminder that this conflict
> >> still exists.
> >
> > Rob, do you have an immutable branch to drag the affecting commit so
> > that I can merge & resolve in my side?
>
> Yes, use this branch:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/property-move
OK, thanks.
When are you going to send a pull request to Linus? I planned to do
for sound tree in tomorrow. If you will do earlier, I'll try to
resolve in my side.
Takashi
next prev parent reply other threads:[~2017-07-04 16:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 2:25 linux-next: manual merge of the sound-asoc tree with the pm tree Stephen Rothwell
2017-07-03 2:55 ` Stephen Rothwell
2017-07-03 14:10 ` Takashi Iwai
2017-07-04 16:00 ` Rob Herring
2017-07-04 16:09 ` Takashi Iwai [this message]
2017-07-04 16:55 ` Rob Herring
2017-07-04 17:44 ` Takashi Iwai
2017-07-04 20:13 ` Rafael J. Wysocki
2017-07-05 7:34 ` Takashi Iwai
2017-07-05 8:12 ` Takashi Iwai
2017-07-05 10:19 ` Mark Brown
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=s5hr2xwdw0i.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=broonie@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=robh@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/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