Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: [GIT PULL] arm-soc new features (part 2/2) for 3.1 | Date | Wed, 27 Jul 2011 17:07:53 +0200 |
| |
On Wednesday 27 July 2011, Linus Torvalds wrote: > I compared the end result with yours, and we did some things a bit > differently, but on the whole it looks pretty identical. We have a > different resolution for "exynos4_cpu_suspend()", but afaik mine is > better (it looks like from a type standpoint it should return int, but > due to the panic it doesn't matter). And we did those > OMAP4430_DLL_OVERRIDE_SHIFT/MASK defines in a different order. I have > some other changes in my tree (Andrew's patch-set for asm/atomic.h > etc), so that makes for other differences in arch/arm, but it looks > like it's ok. > > But you should double-check. I didn't compile-test any of it, I don't > do the cross-compile thing, and maybe I missed something.
Looks all good as far as I can tell. Your exynos4_cpu_suspend is better than the solution I had in next and everything else is equivalent.
I'm still in the process of fixing randconfig builds that have never been working for most arm platforms, so I can do a better job at automatically doing build tests myself. My guess is that there will be several build regressions due to stuff coming in but that they are not the result of mismerges.
Arnd
| |