[GIT PULL] DEBUG_LL platform updates for 3.2
Russell King - ARM Linux
linux at arm.linux.org.uk
Thu Oct 13 04:28:36 EDT 2011
On Wed, Oct 12, 2011 at 10:30:11AM +0200, Arnd Bergmann wrote:
> On Tuesday 11 October 2011 20:03:38 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.
>
> Ok, done.
Bypassing maintainers stinks - especially when there are unaddressed
comments outstanding. Nicolas has "simplified" my objections in this
request for you to pull - and has completely ignored the problem that
it breaks ZBOOT_ROM by deleting the zreladdr definitions on EP93xx
with no way for that to be provided.
Moreover, it forces EP93xx to always use AUTO_ZRELADDR, but you can
still select ZBOOT_ROM, which is an invalid combination.
Not only that, I'm carrying a patch from Sascha which detects the
multiple-zreladdr problem and prevents building such kernels and this
conflicts with that patch.
So I'm not pulling Nicolas' mach_memory_h branch until he comes to his
senses. I had pointed this out but got a rather stroppy replies in
return.
More information about the linux-arm-kernel
mailing list