From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755550AbdHYJhn (ORCPT ); Fri, 25 Aug 2017 05:37:43 -0400 Received: from mga05.intel.com ([192.55.52.43]:58966 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754329AbdHYJhd (ORCPT ); Fri, 25 Aug 2017 05:37:33 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,424,1498546800"; d="scan'208";a="1166042593" Message-ID: <1503653849.25945.96.camel@linux.intel.com> Subject: Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree From: Andy Shevchenko To: Stephen Rothwell , Mark Brown , Liam Girdwood , Takashi Iwai Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Tom Rini Date: Fri, 25 Aug 2017 12:37:29 +0300 In-Reply-To: <20170825125705.44de0444@canb.auug.org.au> References: <20170825125705.44de0444@canb.auug.org.au> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Intel Finland Oy