Re: linux-next: manual merge of the sound-asoc tree with the pm tree
From: Rob Herring
Date: Tue Jul 04 2017 - 12:00:58 EST
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]
>> 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: