Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753874Ab0HSWX5 (ORCPT ); Thu, 19 Aug 2010 18:23:57 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:43572 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751469Ab0HSWX5 convert rfc822-to-8bit (ORCPT ); Thu, 19 Aug 2010 18:23:57 -0400 MIME-Version: 1.0 In-Reply-To: <4C6DA3E7.20206@freescale.com> References: <20100801074831.1099.3318.stgit@angua> <4C6DA3E7.20206@freescale.com> From: Grant Likely Date: Thu, 19 Aug 2010 16:23:36 -0600 X-Google-Sender-Auth: ImunHjzAGNNmb9qHxK7BLRncQRY Message-ID: Subject: Re: [PATCH] of/device: Replace struct of_device with struct of_platform To: Timur Tabi Cc: Mark Brown , Liam Girdwood , sfr@canb.auug.org.au, monstr@monstr.eu, microblaze-uclinux@itee.uq.edu.au, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, benh@kernel.crashing.org, sparclinux@vger.kernel.org, davem@davemloft.net, alsa-devel mailing list Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1111 Lines: 28 On Thu, Aug 19, 2010 at 3:36 PM, Timur Tabi wrote: > Grant Likely wrote: >> On Thu, Aug 19, 2010 at 2:36 PM, Timur Tabi wrote: >>> On Sun, Aug 1, 2010 at 2:57 AM, Grant Likely wrote: >>> >>>> ?sound/soc/fsl/mpc8610_hpcd.c ? ? ? ? ? ? ? ? ?| ? ?4 +- >>> >>> This file is/was significantly rewritten for 2.6.37. ?I posted a fix >>> to the alsa mailing list, but it will conflict with your patch. ?You >>> might want to remove all changes to sound/soc/fsl from this commit. >> >> This change is already in Linus' tree. > > Then I suspect the ALSA guys are going to have a merge conflict coming up, > because I had to make these changes to the -next branch. It is a trivial conflict. They shouldn't have any problem fixing it up. g. -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/