From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1755243AbdHYJkU (ORCPT <rfc822;w@1wt.eu>);
        Fri, 25 Aug 2017 05:40:20 -0400
Received: from mx2.suse.de ([195.135.220.15]:59806 "EHLO mx1.suse.de"
        rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
        id S1754679AbdHYJkQ (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 25 Aug 2017 05:40:16 -0400
Date: Fri, 25 Aug 2017 11:40:14 +0200
Message-ID: <s5hshgggf41.wl-tiwai@suse.de>
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
In-Reply-To: <1503653849.25945.96.camel@linux.intel.com>
References: <20170825125705.44de0444@canb.auug.org.au>
        <1503653849.25945.96.camel@linux.intel.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.2
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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