On Wed, 19 Jun 2013 15:52:02 +0200 Arnd Bergmann <a...@arndb.de> 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 <h...@sgi.com> > > > To: Andrew Morton <a...@linux-foundation.org> > > > Cc: Russell King <rmk+ker...@arm.linux.org.uk> > > > Cc: Russ Anderson <r...@sgi.com> > > > Cc: Robin Holt <h...@sgi.com> > > > Cc: H. Peter Anvin <h...@zytor.com> > > > Cc: Guan Xuetao <g...@mprc.pku.edu.cn> > > > Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org> > > > Cc: the arch/x86 maintainers <x...@kernel.org> > > > Cc: Arm Mailing List <linux-arm-ker...@lists.infradead.org> > > > Acked-by: Russell King <rmk+ker...@arm.linux.org.uk> > > > > 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
