Re: [PATCH -v9 04/11] Move shutdown/reboot related functions tokernel/reboot.c

From: Andrew Morton
Date: Thu May 09 2013 - 16:51:08 EST


On Thu, 9 May 2013 14:23:18 -0500 Robin Holt <holt@xxxxxxx> wrote:

> This patch is preparatory. It moves reboot related syscall, etc
> functions from kernel/sys.c to kernel/reboot.c.

This doesn't apply.

> -static void migrate_to_reboot_cpu(void)
> -{
> - /* The boot cpu is always logical cpu 0 */
> - int cpu = 0;
> -
> - cpu_hotplug_disable();
> -
> - /* Make certain the cpu I'm about to reboot on is online */
> - if (!cpu_online(cpu))
> - cpu = cpumask_first(cpu_online_mask);

Here it's deleting code which was already modified by "[PATCH -v9
02/11] Migrate shutdown/reboot to boot cpu.". So patch [4/11]
generates rejects when applied on top of [patch 2/11].

There are several similar glitches.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/