From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752512AbdGDQJV (ORCPT <rfc822;w@1wt.eu>);
        Tue, 4 Jul 2017 12:09:21 -0400
Received: from mx2.suse.de ([195.135.220.15]:53829 "EHLO mx1.suse.de"
        rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
        id S1752206AbdGDQJU (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 4 Jul 2017 12:09:20 -0400
Date: Tue, 04 Jul 2017 18:09:17 +0200
Message-ID: <s5hr2xwdw0i.wl-tiwai@suse.de>
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
In-Reply-To: <CAL_Jsq+bGVONzeRZ-wQ2UGARe537SLe1kqSxPYVQwwXneK3m9g@mail.gmail.com>
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>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.2
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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