[Ksummit-2011-discuss] experience with the new arm-soc workflow (Was: Re: ARM Maintainers workshop at Kernel Summit) 2011

[Steven Rostedt]

On Tue, 2011-08-09 at 16:34 +0100, Mark Brown wrote:
> On Tue, Aug 09, 2011 at 11:07:42AM -0400, Steven Rostedt wrote:
> 
> > Where a clean up goes should be more about why the clean up is
> > happening. If it is just a clean up for the sake of cleaning up, then a
> > separate branch is suitable. But if a clean up is there to pave the way
> > for new features, then that clean up should be with the features it
> > allows to provide.
> 
> Though one of the frequent consequences of any widespread cleanup is
> that it ends up touching lots of places and consequently colliding with
> other work.

Yeah, but Linus himself said he's good at merges. Normal cleanups should
not be too difficult to figure out conflicts of this nature.

-- Steve