[GIT PULL] Samsung cleanup-spi for v3.3

[Kukjin Kim]

Arnd Bergmann wrote:
> 
> On Saturday 24 December 2011, Kukjin Kim wrote:
> > Please pull the samsung-cleanup-spi for v3.3.
> > It depends on samsung-devel-spi3 branch...
> >
> > If any problems, please let me know.
> 
> I've applied next-samsung-cleanup-mmc2, next-samsung-devel-spi3 and
> next-samsung-cleanup-spi4, all into next/cleanup2 now.
> 
OK.

> This was the best solution I could come up with, because strictly
> following
> the normal rules would have meant creating an insane number of merge
> commits and sending out each of your branches separately to Linus, after
> all the other stuff.
> 
Yes, right. I agree.

> I normally try to send out all cleanups before everything else, except
> when a cleanup has a dependency on another branch, in which case I have
> to create an extra cleanup branch. What you sent me would have
> meant doing something like:
> 
> 1. cleanup
> 	all cleanup branches except samsung
> 
> 2. dt
> 	all dt branches
> 
> 3. devel
> 	all devel branches, including devel-ohci but not devel-spi
> 	or devel-mmc-spi
> 
> 4.-10.
> 	everything else except samsung
> 
> 11. cleanup2
> 	only samsung/cleanup-mmc
> 
> 12. devel2
> 	only samsung/devel-spi
> 
> 13. cleanup3
> 	only samsung/cleanup-spi
> 
> 14. devel3
> 	only samsung/devel-mmc-spi
> 
> I've now squashed samsung/devel-spi into the cleanup2 branch, which also
> lets me
> put cleanup-spi in there, and put it right after next/dt. This works
> because
> devel-spi can still be considered a cleanup (although you did not consider
> it that).
> 
Hmm...I thought it's a kind of developing but cleanup2 branch and above
ordering are ok to me.

> Right now, the order we have in arm-soc is "fixes-non-critical",
"cleanup",
> "dt",
> "cleanup2", "soc", "boards", "devel", "drivers", "pm", "timer", "move".
> There
> is some flexibility towards the end, but if you use a different order,
> that creates
> circular dependencies which we absolutely don't want.
> 
Yes, we don't :)

OK, thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim at samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.