From: Takashi Iwai <tiwai@suse.de>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Tom Rini <trini@konsulko.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree
Date: Fri, 25 Aug 2017 11:40:14 +0200 [thread overview]
Message-ID: <s5hshgggf41.wl-tiwai@suse.de> (raw)
In-Reply-To: <1503653849.25945.96.camel@linux.intel.com>
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 ("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.
Right. Mark, could you fix in your tree?
thanks,
Takashi
next prev parent reply other threads:[~2017-08-25 9:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 2:57 linux-next: manual merge of the sound-asoc tree with the sound-current tree Stephen Rothwell
2017-08-25 9:37 ` Andy Shevchenko
2017-08-25 9:40 ` Takashi Iwai [this message]
2017-08-25 11:02 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-11-29 0:35 Stephen Rothwell
2021-11-29 9:23 ` Takashi Iwai
2021-11-29 12:10 ` Mark Brown
2021-11-29 14:29 ` Kai Vehmanen
2021-11-29 14:43 ` Takashi Iwai
2021-11-29 17:16 ` Kai Vehmanen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hshgggf41.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=trini@konsulko.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.