lkml.org 
[lkml]   [2017]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the sound-asoc tree with the pm tree
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

Rob

\
 
 \ /
  Last update: 2017-07-04 18:01    [W:0.490 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site