On Wed, 19 Jun 2013 15:52:02 +0200 Arnd Bergmann <[email protected]> wrote:
> On Wednesday 19 June 2013 12:58:10 Arnd Bergmann wrote: > > On Thursday 06 June 2013 06:47:23 Robin Holt wrote: > > > 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 <[email protected]> > > > To: Andrew Morton <[email protected]> > > > Cc: Russell King <[email protected]> > > > Cc: Russ Anderson <[email protected]> > > > Cc: Robin Holt <[email protected]> > > > Cc: H. Peter Anvin <[email protected]> > > > Cc: Guan Xuetao <[email protected]> > > > Cc: Linux Kernel Mailing List <[email protected]> > > > Cc: the arch/x86 maintainers <[email protected]> > > > Cc: Arm Mailing List <[email protected]> > > > Acked-by: Russell King <[email protected]> > > > > 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
