From: "Rafael J. Wysocki" <rjw@rjwysocki•net>
To: Rob Herring <robh@kernel•org>
Cc: Takashi Iwai <tiwai@suse•de>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>,
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 22:13:33 +0200 [thread overview]
Message-ID: <2002105.224HtT5E8x@aspire.rjw.lan> (raw)
In-Reply-To: <CAL_Jsq+sYxWq+Y1=iGtLk4hSQWXJBQ7LJVh9FbsOMshKzqjKcw@mail.gmail.com>
On Tuesday, July 04, 2017 11:55:47 AM Rob Herring wrote:
> On Tue, Jul 4, 2017 at 11:09 AM, Takashi Iwai <tiwai@suse•de> wrote:
> > 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.
>
> I think Rafael has already sent his changes to Linus with the same
> branch.
No, I haven't yet.
I've sent my ACPI and PM pull requests, but this will be a separate one.
Thanks,
Rafael
next prev parent reply other threads:[~2017-07-04 20:21 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
2017-07-04 16:55 ` Rob Herring
2017-07-04 17:44 ` Takashi Iwai
2017-07-04 20:13 ` Rafael J. Wysocki [this message]
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=2002105.224HtT5E8x@aspire.rjw.lan \
--to=rjw@rjwysocki$(echo .)net \
--cc=broonie@kernel$(echo .)org \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=sakari.ailus@linux$(echo .)intel.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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