From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [GIT PULL] few more fixes for v3.3-rc6 Date: Thu, 8 Mar 2012 10:13:46 -0800 Message-ID: <20120308181345.GU12083@atomide.com> References: <20120308180441.GT12083@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:41633 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752862Ab2CHSNu (ORCPT ); Thu, 8 Mar 2012 13:13:50 -0500 Content-Disposition: inline In-Reply-To: <20120308180441.GT12083@atomide.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Arnd Bergmann , Olof Johansson Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Olof, * Tony Lindgren [120308 09:34]: > > Vaibhav Hiremath (1): > ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision FYI, this one will cause a minor merge conflict with what's in arm-soc/for-next, here's how to resolve for reference: --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@@ -397,7 -342,8 +397,8 @@@ void __init omap3xxx_check_revision(voi break; case 0xb944: omap_revision = AM335X_REV_ES1_0; - *cpu_rev = "1.0"; + cpu_rev = "1.0"; + break; case 0xb8f2: switch (rev) { case 0: Regards, Tony From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Thu, 8 Mar 2012 10:13:46 -0800 Subject: [GIT PULL] few more fixes for v3.3-rc6 In-Reply-To: <20120308180441.GT12083@atomide.com> References: <20120308180441.GT12083@atomide.com> Message-ID: <20120308181345.GU12083@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Olof, * Tony Lindgren [120308 09:34]: > > Vaibhav Hiremath (1): > ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision FYI, this one will cause a minor merge conflict with what's in arm-soc/for-next, here's how to resolve for reference: --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@@ -397,7 -342,8 +397,8 @@@ void __init omap3xxx_check_revision(voi break; case 0xb944: omap_revision = AM335X_REV_ES1_0; - *cpu_rev = "1.0"; + cpu_rev = "1.0"; + break; case 0xb8f2: switch (rev) { case 0: Regards, Tony