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

2017-08-25 Thread Stephen Rothwell
Hi Andy, On Fri, 25 Aug 2017 12:37:29 +0300 Andy Shevchenko wrote: > > This one AFAIU is a quick fix solely for v4.13. > > Thus, the correct fix is to remove all 3 IDs from that table to get: > >  static const struct i2c_device_id rt5677_i2c_id[] = { > > { } > }; > MODULE_DEVICE_TAB

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

2017-08-25 Thread Takashi Iwai
On Fri, 25 Aug 2017 11:37:29 +0200, Andy Shevchenko wrote: > > On Fri, 2017-08-25 at 12:57 +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the sound-asoc tree got a conflict in: > > > >   sound/soc/codecs/rt5677.c > > > > between commit: > > > >   9ce76511b67b ("

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

2017-08-25 Thread Andy Shevchenko
On Fri, 2017-08-25 at 12:57 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the sound-asoc tree got a conflict in: > >   sound/soc/codecs/rt5677.c > > between commit: > >   9ce76511b67b ("ASoC: rt5677: Reintroduce I2C device IDs") This one AFAIU is a quick fix solely f

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

2017-08-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in: sound/soc/codecs/rt5677.c between commit: 9ce76511b67b ("ASoC: rt5677: Reintroduce I2C device IDs") from the sound-current tree and commit: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources")