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 09:19:34 +0100 Message-ID: <5018E696.9000305@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> <5018DC9F.30502@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" 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 9AAD6264FD6 for ; Wed, 1 Aug 2012 10:19:34 +0200 (CEST) Received: by eaaa13 with SMTP id a13so1313935eaa.38 for ; Wed, 01 Aug 2012 01:19:36 -0700 (PDT) In-Reply-To: <5018DC9F.30502@linaro.org> 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 T24gMDEvMDgvMTIgMDg6MzcsIExlZSBKb25lcyB3cm90ZToKPiBPbiAzMS8wNy8xMiAxNzo0Niwg U2VyZ2VpIFNodHlseW92IHdyb3RlOgo+PiBIZWxsby4KPj4KPj4gT24gMDcvMzEvMjAxMiAwNToz MSBQTSwgTGVlIEpvbmVzIHdyb3RlOgo+Pgo+PiAgICAgU3ViamVjdCBkb2Vzbid0IHBhcnNlIGZv ciBtZS4uLgo+Pgo+Pj4gVGhlIHBsYXRmb3JtIGF0dGVtcHRzIHRvIHJlZ2lzdGVyIHBsYXRmb3Jt IGRldmljZSAnc25kX3NvY191ODUwMCcKPj4+IHdoaWNoIGRvZXNuJ3QgYWN0dWFsbHkgZXhpc3Qu IEhlcmUgd2UgY2hhbmdlIHRoZSByZWZlcmVuY2UgdG8gdGhlCj4+PiBjb3JyZWN0IG9uZSAnc25k X3NvY19tb3A1MDAnLgo+Pgo+Pj4gU2lnbmVkLW9mZi1ieTogTGVlIEpvbmVzIDxsZWUuam9uZXNA bGluYXJvLm9yZz4KPgo+IEFjdHVhbGx5LCBpdCBkb2VzIG1ha2Ugc2Vuc2U/Cj4KPiBBcyBhIHNl bnRlbmNlOiAiVGhpcyBwYXRjaCBmaXhlcyBtZXJnZSBlcnJvcjogc28gc3VjaCBzdHJ1Y3R1cmUg J3N0cnVjdCBzbmRfc29jX3U4NTAwJy4KClRoYXQncyBpbnRlcmVzdGluZy4gTm90IG9ubHkgd2hl biBJIHJlYWQgaXQgZGlkIGl0IHNlZW0gY29ycmVjdCwgSSBhbHNvIAp3cm90ZSBpdCB3cm9uZyAi YXMgYSBzZW50ZW5jZSIuIE9mIGNvdXJzZSAic28iIHNob3VsZCBiZSAibm8iLgoKCi0tIApMZWUg Sm9uZXMKTGluYXJvIFNULUVyaWNzc29uIExhbmRpbmcgVGVhbSBMZWFkCkxpbmFyby5vcmcg4pSC IE9wZW4gc291cmNlIHNvZnR3YXJlIGZvciBBUk0gU29DcwpGb2xsb3cgTGluYXJvOiBGYWNlYm9v ayB8IFR3aXR0ZXIgfCBCbG9nCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkFsc2EtZGV2ZWwgbWFpbGluZyBsaXN0CkFsc2EtZGV2ZWxAYWxzYS1wcm9qZWN0 Lm9yZwpodHRwOi8vbWFpbG1hbi5hbHNhLXByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxz YS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Wed, 01 Aug 2012 09:19:34 +0100 Subject: [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' In-Reply-To: <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> <5018DC9F.30502@linaro.org> Message-ID: <5018E696.9000305@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 01/08/12 08:37, Lee Jones wrote: > 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'. That's interesting. Not only when I read it did it seem correct, I also wrote it wrong "as a sentence". Of course "so" should be "no". -- 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 S1754763Ab2HAITl (ORCPT ); Wed, 1 Aug 2012 04:19:41 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:36462 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752752Ab2HAITi (ORCPT ); Wed, 1 Aug 2012 04:19:38 -0400 Message-ID: <5018E696.9000305@linaro.org> Date: Wed, 01 Aug 2012 09:19:34 +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> <5018DC9F.30502@linaro.org> In-Reply-To: <5018DC9F.30502@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/08/12 08:37, Lee Jones wrote: > 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'. That's interesting. Not only when I read it did it seem correct, I also wrote it wrong "as a sentence". Of course "so" should be "no". -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog