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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1503653849.25945.96.camel@linux.intel.com>
Date:   Fri, 25 Aug 2017 12:37:29 +0300
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        Takashi Iwai <tiwai@...e.de>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Tom Rini <trini@...sulko.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the
 sound-current tree

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 <andriy.shevchenko@...ux.intel.com>
Intel Finland Oy