[GIT PULL] DEBUG_LL platform updates for 3.2

[Nicolas Pitre]

On Thu, 13 Oct 2011, Russell King - ARM Linux wrote:

> On Tue, Oct 11, 2011 at 08:03:38PM -0400, Nicolas Pitre wrote:
> > On Tue, 11 Oct 2011, Arnd Bergmann wrote:
> > 
> > > I've stuck them into the arm-soc tree for now, so we get linux-next
> > > coverage, but I won't send them to Linus this way because then we
> > > would get the same commits twice in the history.
> > 
> > Could you please do the same with the following:
> > 
> >   git://git.linaro.org/people/nico/linux.git mach_memory_h
> > 
> > Russell pulled it at some point, and dropped it due to concerns about 
> > repeated conflict resolutions (or so I presume).  I just did a test 
> > merge between your for-next branch and the above and that looked trivial 
> > enough.
> 
> _and_ the breakage of the ZBOOT_ROM stuff.

In order to resolve this impass, I simply dropped the ep93xx patch from 
the series.  This could be revisited later, just like for the 
StrongARM/XScale cache mapping patches.  Pretty please, tell me if there 
is still something which is not to your satisfaction.

> So I'm now interpreting your request to Arnd to pull it as an attempt to
> bypass me.  That's not what arm-soc is supposed to be about, and that's
> certainly not what Linaro is supposed to be doing.

Not at all.  I asked Arnd to pull it not so this could go to Linus via 
the arm-soc tree, but rather that this could get increased exposure in 
both the arm-soc tree and linux-next, and get a feel for the magnitude 
of the merge conflicts and possible build errors.

I'm therefore officially asking you again to pull this series, given 
that I've removed from it the last offending piece I know about.


Nicolas