[PATCH -v9 04/11] Move shutdown/reboot related functions to kernel/reboot.c

Robin Holt holt at sgi.com
Fri May 10 05:50:14 EDT 2013


On Thu, May 09, 2013 at 07:05:53PM -0500, Robin Holt wrote:
> On Thu, May 09, 2013 at 01:51:00PM -0700, Andrew Morton wrote:
> > On Thu,  9 May 2013 14:23:18 -0500 Robin Holt <holt at sgi.com> wrote:
> > 
> > > This patch is preparatory.  It moves reboot related syscall, etc
> > > functions from kernel/sys.c to kernel/reboot.c.
> > 
> > This doesn't apply.
> 
> Weird, I just grabbed a recent Linus kernel tree and all 11 applied.
> I then did an update to linus' tree to commit 70eba4226 and now I get
> rejects on arm.  I will resubmit a -v10 fixed up shortly.

I wonder what you are seeing.  I get all 11 to apply fairly cleanly with
only arch/arm/mach-imx/common.h getting conflicts on a commits after 009e63f
which are related to context.  Otherwise, they applied cleanly.  I assume
you removed the earlier version before trying to apply.

I can resubmit (and will add Ingo's Acked-by), but am not sure it is
going to help the situation.  How would you like me to proceed?

Robin



More information about the linux-arm-kernel mailing list