Re: linux-next: manual merge of the sound-asoc tree with the pm tree
From: Rob Herring
Date: Tue Jul 04 2017 - 12:56:23 EST
On Tue, Jul 4, 2017 at 11:09 AM, Takashi Iwai <tiwai@xxxxxxx> 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@xxxxxxx> 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.