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