From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Date: Wed, 01 Aug 2012 08:37:03 +0100 Message-ID: <5018DC9F.30502@linaro.org> References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> <1343741493-17671-6-git-send-email-lee.jones@linaro.org> <50180BF6.6080908@mvista.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ey0-f179.google.com (mail-ey0-f179.google.com [209.85.215.179]) by alsa0.perex.cz (Postfix) with ESMTP id 697F9264F20 for ; Wed, 1 Aug 2012 09:37:03 +0200 (CEST) Received: by eaaa13 with SMTP id a13so1302579eaa.38 for ; Wed, 01 Aug 2012 00:37:05 -0700 (PDT) In-Reply-To: <50180BF6.6080908@mvista.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Sergei Shtylyov Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, olalilja@yahoo.se, STEricsson_nomadik_linux@list.st.com, lrg@ti.com, linux-arm-kernel@lists.infradead.org List-Id: alsa-devel@alsa-project.org T24gMzEvMDcvMTIgMTc6NDYsIFNlcmdlaSBTaHR5bHlvdiB3cm90ZToKPiBIZWxsby4KPiAKPiBP biAwNy8zMS8yMDEyIDA1OjMxIFBNLCBMZWUgSm9uZXMgd3JvdGU6Cj4gCj4gICAgU3ViamVjdCBk b2Vzbid0IHBhcnNlIGZvciBtZS4uLgo+IAo+PiBUaGUgcGxhdGZvcm0gYXR0ZW1wdHMgdG8gcmVn aXN0ZXIgcGxhdGZvcm0gZGV2aWNlICdzbmRfc29jX3U4NTAwJwo+PiB3aGljaCBkb2Vzbid0IGFj dHVhbGx5IGV4aXN0LiBIZXJlIHdlIGNoYW5nZSB0aGUgcmVmZXJlbmNlIHRvIHRoZQo+PiBjb3Jy ZWN0IG9uZSAnc25kX3NvY19tb3A1MDAnLgo+IAo+PiBTaWduZWQtb2ZmLWJ5OiBMZWUgSm9uZXMg PGxlZS5qb25lc0BsaW5hcm8ub3JnPgoKQWN0dWFsbHksIGl0IGRvZXMgbWFrZSBzZW5zZT8KCkFz IGEgc2VudGVuY2U6ICJUaGlzIHBhdGNoIGZpeGVzIG1lcmdlIGVycm9yOiBzbyBzdWNoIHN0cnVj dHVyZSAnc3RydWN0IHNuZF9zb2NfdTg1MDAnLgoKCi0tIApMZWUgSm9uZXMKTGluYXJvIFNULUVy aWNzc29uIExhbmRpbmcgVGVhbSBMZWFkCkxpbmFyby5vcmcg4pSCIE9wZW4gc291cmNlIHNvZnR3 YXJlIGZvciBBUk0gU29DcwpGb2xsb3cgTGluYXJvOiBGYWNlYm9vayB8IFR3aXR0ZXIgfCBCbG9n Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFsc2EtZGV2 ZWwgbWFpbGluZyBsaXN0CkFsc2EtZGV2ZWxAYWxzYS1wcm9qZWN0Lm9yZwpodHRwOi8vbWFpbG1h bi5hbHNhLXByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxzYS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Wed, 01 Aug 2012 08:37:03 +0100 Subject: [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' In-Reply-To: <50180BF6.6080908@mvista.com> References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> <1343741493-17671-6-git-send-email-lee.jones@linaro.org> <50180BF6.6080908@mvista.com> Message-ID: <5018DC9F.30502@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 31/07/12 17:46, Sergei Shtylyov wrote: > Hello. > > On 07/31/2012 05:31 PM, Lee Jones wrote: > > Subject doesn't parse for me... > >> The platform attempts to register platform device 'snd_soc_u8500' >> which doesn't actually exist. Here we change the reference to the >> correct one 'snd_soc_mop500'. > >> Signed-off-by: Lee Jones Actually, it does make sense? As a sentence: "This patch fixes merge error: so such structure 'struct snd_soc_u8500'. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754697Ab2HAHhJ (ORCPT ); Wed, 1 Aug 2012 03:37:09 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:34049 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754592Ab2HAHhG (ORCPT ); Wed, 1 Aug 2012 03:37:06 -0400 Message-ID: <5018DC9F.30502@linaro.org> Date: Wed, 01 Aug 2012 08:37:03 +0100 From: Lee Jones User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: Sergei Shtylyov CC: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se, STEricsson_nomadik_linux@list.st.com, lrg@ti.com Subject: Re: [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> <1343741493-17671-6-git-send-email-lee.jones@linaro.org> <50180BF6.6080908@mvista.com> In-Reply-To: <50180BF6.6080908@mvista.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 31/07/12 17:46, Sergei Shtylyov wrote: > Hello. > > On 07/31/2012 05:31 PM, Lee Jones wrote: > > Subject doesn't parse for me... > >> The platform attempts to register platform device 'snd_soc_u8500' >> which doesn't actually exist. Here we change the reference to the >> correct one 'snd_soc_mop500'. > >> Signed-off-by: Lee Jones Actually, it does make sense? As a sentence: "This patch fixes merge error: so such structure 'struct snd_soc_u8500'. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog