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

On Wed, Jul 05, 2017 at 10:12:56AM +0200, Takashi Iwai wrote: > For your convenience, I branched off topic/of-graph-base that contains > only the minimal set of commits that conflict with drivers/of/*. > Feel free to use this branch instead of the branches above. I did suggest doing this when the

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

On Wed, 05 Jul 2017 09:34:41 +0200, Takashi Iwai wrote: > > On Tue, 04 Jul 2017 22:13:33 +0200, > Rafael J. Wysocki wrote: > > > > On Tuesday, July 04, 2017 11:55:47 AM Rob Herring wrote: > > > On Tue, Jul 4, 2017 at 11:09 AM, Takashi Iwai wrote: > > > > On Tue, 04 Jul 2017 18:00:30 +0200, > > >

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

On Tue, 04 Jul 2017 22:13:33 +0200, Rafael J. Wysocki wrote: > > On Tuesday, July 04, 2017 11:55:47 AM Rob Herring wrote: > > On Tue, Jul 4, 2017 at 11:09 AM, Takashi Iwai wrote: > > > On Tue, 04 Jul 2017 18:00:30 +0200, > > > Rob Herring wrote: > > >> > > >> On Mon, Jul 3, 2017 at 9:10 AM, Takas

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

On Tuesday, July 04, 2017 11:55:47 AM Rob Herring wrote: > On Tue, Jul 4, 2017 at 11:09 AM, Takashi Iwai wrote: > > On Tue, 04 Jul 2017 18:00:30 +0200, > > Rob Herring wrote: > >> > >> On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai wrote: > >> > On Mon, 03 Jul 2017 04:55:24 +0200, > >> > Stephen Ro

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

On Tue, 04 Jul 2017 18:55:47 +0200, Rob Herring wrote: > > On Tue, Jul 4, 2017 at 11:09 AM, Takashi Iwai wrote: > > On Tue, 04 Jul 2017 18:00:30 +0200, > > Rob Herring wrote: > >> > >> On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai wrote: > >> > On Mon, 03 Jul 2017 04:55:24 +0200, > >> > Stephen R

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 wrote: > On Tue, 04 Jul 2017 18:00:30 +0200, > Rob Herring wrote: >> >> On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai wrote: >> > On Mon, 03 Jul 2017 04:55:24 +0200, >> > Stephen Rothwell wrote: >> >> >> >> Hi all, >> >> >> >> [cc-ing the sound tree ma

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

On Tue, 04 Jul 2017 18:00:30 +0200, Rob Herring wrote: > > On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai 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,

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

On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai 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 imm

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

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 & res

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

Hi all, [cc-ing the sound tree maintainer] With the merge window opening, just a reminder that this conflict still exists. On Fri, 23 Jun 2017 12:25:34 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the sound-asoc tree got a conflict in: > > drivers/of/base.c >

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

Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in: drivers/of/base.c between commit: 1df09bc66f9b ("of: Move OF property and graph API from base.c to property.c") from the pm tree and commits: 4c9c3d595f1b ("of_graph: add of_graph_get_remote_endpoint()") 0ef472