linux-next: manual merge of the akpm tree with the arm-soc tree

[Jason Cooper]

On Tue, Mar 12, 2013 at 12:48:24PM +0000, Arnd Bergmann wrote:
> On Tuesday 12 March 2013, Jason Cooper wrote:
> > I chose to keep them together to maintain bisectability.  Either you
> > have all of the fix (you landed on this branch), or you don't.  Was this
> > the correct decision in this case, or did I miss something?
> 
> I think you don't need to worry about bisection in this case, especially
> as you mentioned that 3.8 is already broken.
> 
> From all I can tell, these are four separate fixes, and you want to have
> all of them get merged, but applying just one of them will not make the
> state of the kernel tree any worse than what it is before the patches.

Ok, thanks for the clarification.  I'll ease up on the bisectability
requirement for fixes in the future.

thx,

Jason.