Subject: Re: linux-next: bad merge in "Merge branch 'rmobile-fixes-for-linus'" ?

From: Arnd Bergmann <[email-masked]>
Date: Sat, 24 Mar 2012 18:28:00 +0000

On Saturday 24 March 2012, Paul Gortmaker wrote:
> Hi Arnd,
> 
> I fed this failure to git bisect:
> 
> arch/arm/mach-shmobile/setup-sh7372.c:63:2: error: implicit declaration
> of function 'init_consistent_dma_size' 
> 
> http://kisskb.ellerman.id.au/kisskb/buildresult/5941296/
> 
> and it came back with your merge below.  Can you have a look and see if
> that makes sense?
> 

Thanks a lot for the report, this was indeed my mistake when merging
the patch. Fixed now.

	Arnd