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

From: Andy Shevchenko <[email-masked]>
Date: Fri, 25 Aug 2017 12:37:29 +0300

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 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_TABLE(i2c, rt5677_i2c_id);

at the end.

-- 
Andy Shevchenko <[email-masked]>
Intel Finland Oy