On Tue, Aug 13, 2019 at 01:16:11PM +1000, Stephen Rothwell wrote:
> On Fri, 9 Aug 2019 13:08:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > sound/soc/sof/intel/hda-dsp.c: In function 'hda_resume':
> > sound/soc/sof/intel/hda-dsp.c:360:22: error: 'hlink' undeclared (first use in this function)
> >   list_for_each_entry(hlink, &bus->hlink_list, list)
> >                       ^~~~~
> > include/linux/list.h:577:7: note: in definition of macro 'list_for_each_entry'
> >   for (pos = list_first_entry(head, typeof(*pos), member); \
> >        ^~~
> > sound/soc/sof/intel/hda-dsp.c:360:22: note: each undeclared identifier is reported only once for each function it appears in
> >   list_for_each_entry(hlink, &bus->hlink_list, list)
> >                       ^~~~~
> > include/linux/list.h:577:7: note: in definition of macro 'list_for_each_entry'
> >   for (pos = list_first_entry(head, typeof(*pos), member); \
> >        ^~~
> > In file included from include/linux/list.h:9,
> >                  from include/linux/kobject.h:19,
> >                  from include/linux/device.h:16,
> >                  from include/sound/hdaudio.h:9,
> >                  from include/sound/hdaudio_ext.h:5,
> >                  from sound/soc/sof/intel/hda-dsp.c:18:
> > sound/soc/sof/intel/hda-dsp.c:360:30: error: 'bus' undeclared (first use in this function)
> >   list_for_each_entry(hlink, &bus->hlink_list, list)
> >                               ^~~
> > include/linux/kernel.h:972:26: note: in definition of macro 'container_of'
> >   void *__mptr = (void *)(ptr);     \
> >                           ^~~
> > include/linux/list.h:490:2: note: in expansion of macro 'list_entry'
> >   list_entry((ptr)->next, type, member)
> >   ^~~~~~~~~~
> > include/linux/list.h:577:13: note: in expansion of macro 'list_first_entry'
> >   for (pos = list_first_entry(head, typeof(*pos), member); \
> >              ^~~~~~~~~~~~~~~~
> > sound/soc/sof/intel/hda-dsp.c:360:2: note: in expansion of macro 'list_for_each_entry'
> >   list_for_each_entry(hlink, &bus->hlink_list, list)
> >   ^~~~~~~~~~~~~~~~~~~
> > sound/soc/sof/intel/hda-dsp.c:364:2: error: #else without #if
> >  #else
> >   ^~~~
> > sound/soc/sof/intel/hda-dsp.c:390:2: error: #endif without #if
> >  #endif
> >   ^~~~~
> > 
> > Caused by commit
> > 
> >   c2f16a94a804 ("Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4")
> > 
> > Looks like the merge resolution is not quite right.
> > 
> > I have used the sound-asoc tree from next-20190808 for today.

> I am still getting this failure ...

Intel people, any thoughts?