linux-kernel - Re: linux-next: manual merge of the sound-asoc tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAL_Jsq+sYxWq+Y1=iGtLk4hSQWXJBQ7LJVh9FbsOMshKzqjKcw@mail.gmail.com>
Date:   Tue, 4 Jul 2017 11:55:47 -0500
From:   Rob Herring <robh@...nel.org>
To:     Takashi Iwai <tiwai@...e.de>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Sakari Ailus <sakari.ailus@...ux.intel.com>,
        Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the pm tree

On Tue, Jul 4, 2017 at 11:09 AM, Takashi Iwai <tiwai@...e.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@...e.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.

Rob