From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the pm tree
Date: Tue, 04 Jul 2017 19:44:34 +0200
Message-ID: <s5hmv8kcd19.wl-tiwai@suse.de>
References: <20170623122534.3303f515@canb.auug.org.au>
        <20170703125524.5403a422@canb.auug.org.au>
        <s5ha84lipbt.wl-tiwai@suse.de>
        <CAL_Jsq+bGVONzeRZ-wQ2UGARe537SLe1kqSxPYVQwwXneK3m9g@mail.gmail.com>
        <s5hr2xwdw0i.wl-tiwai@suse.de>
        <CAL_Jsq+sYxWq+Y1=iGtLk4hSQWXJBQ7LJVh9FbsOMshKzqjKcw@mail.gmail.com>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx2.suse.de ([195.135.220.15]:32811 "EHLO mx1.suse.de"
        rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
        id S1751902AbdGDRoh (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Tue, 4 Jul 2017 13:44:37 -0400
In-Reply-To: <CAL_Jsq+sYxWq+Y1=iGtLk4hSQWXJBQ7LJVh9FbsOMshKzqjKcw@mail.gmail.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
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>

On Tue, 04 Jul 2017 18:55:47 +0200,
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. So either you should merge the branch into your tree or I need
> a branch from you with the relevant commits and I can resolve it.

OK, I'll check it tomorrow.


thanks,

Takashi