On Wed, 19 Jun 2013 15:52:02 +0200 Arnd Bergmann [off-list ref] wrote:

On Wednesday 19 June 2013 12:58:10 Arnd Bergmann wrote:

quoted

On Thursday 06 June 2013 06:47:23 Robin Holt wrote:

quoted

Preparing to move the parsing of reboot= to generic kernel code
forces the change in reboot_mode handling to use the enum.

Signed-off-by: Robin Holt <redacted>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Russell King <redacted>
Cc: Russ Anderson <redacted>
Cc: Robin Holt <redacted>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Guan Xuetao <redacted>
Cc: Linux Kernel Mailing List <redacted>
Cc: the arch/x86 maintainers <x86@kernel.org>
Cc: Arm Mailing List <redacted>
Acked-by: Russell King <redacted>

Should we merge this through the arm-soc tree?

I'm getting a few conflicts with new platforms getting added
using the old interface.

Hmm, I realized after sending it that this patch depends on
at least one other patch to add the 'enum'. Any suggestions
for how to handle that?

This patchset gets a lot of rejects which I keep on fixing up.  Please
merge up early in the merge window and compile-test (and review) the
linux-next changes to make sure I didn't muck up the reject-fixing,
then we should be fine.