Re: [FAILURE] omap4430-sdp allnoconfig

From: Stephen Boyd <sboyd@codeaurora.org>
To: Olof Johansson <olof@lixom.net>
Cc: linux-omap <linux-omap@vger.kernel.org>,
	Russell King - ARM Linux <linux@arm.linux.org.uk>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	"arm@kernel.org" <arm@kernel.org>
Subject: Re: [FAILURE] omap4430-sdp allnoconfig
Date: Fri, 2 Aug 2013 13:56:49 -0700	[thread overview]
Message-ID: <20130802205649.GB8296@codeaurora.org> (raw)
In-Reply-To: <CAOesGMhs2osur+VixuyknEWDNy9ekp=yY_6J40W_qRN1TsFWBA@mail.gmail.com>

On 08/02, Olof Johansson wrote:
> On Fri, Aug 2, 2013 at 1:44 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> > On 08/01, Olof Johansson wrote:
> >> On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote:
> >> > On 08/01, Santosh Shilimkar wrote:
> >> > > This one looks fine for me. Can you send above in
> >> > > a proper patch ? Let me know if you want me to
> >> > > send it.
> >> > >
> >> >
> >> > Here's a proper patch. Olof, can you please apply this on top of
> >> > the merge (and maybe you can fix the merge again to handle the
> >> > HAVE_CAN problem I mentioned earlier).
> >> >
> >> > ---8<---
> >> > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n
> >> >
> >> > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer
> >> > API, 2013-03-04) broke the omap build when SMP=n because the TWD
> >> > functions are only compiled on SMP=y builds. Stub out the TWD
> >> > calls when the TWD isn't built in to to keep everything building.
> >> >
> >> > arch/arm/mach-omap2/built-in.o: In function
> >> > `omap4_local_timer_init':
> >> > dss-common.c:(.init.text+0x1d90): undefined reference to
> >> > `twd_local_timer_register'
> >> >
> >> > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
> >> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> >> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> >>
> >> Thanks, applied (with the reported-by changed as requested)
> >>
> >
> > It looks like somehow you became the author. Is there anyway you
> > can fix that and possibly fix the merge before it to not add
> > HAVE_CAN_FLEXCAN if CAN in mach-imx/Kconfig?
> 
> That's because the patch wasn't sent such that it could be applied
> with git am, and forgot to set authorship back. Fixed now.
> 

Ah sorry, I thought you would use git am --scissors so it would
keep the authorship from the sender. I'll just add From: in
future scissored patches to make this simpler.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation