Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755889Ab3EJAGA (ORCPT ); Thu, 9 May 2013 20:06:00 -0400 Received: from relay3.sgi.com ([192.48.152.1]:54262 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755822Ab3EJAFz (ORCPT ); Thu, 9 May 2013 20:05:55 -0400 Date: Thu, 9 May 2013 19:05:53 -0500 From: Robin Holt To: Andrew Morton Cc: Robin Holt , "H. Peter Anvin" , Russ Anderson , Russell King , Guan Xuetao , Linux Kernel Mailing List , the arch/x86 maintainers , Arm Mailing List Subject: Re: [PATCH -v9 04/11] Move shutdown/reboot related functions to kernel/reboot.c Message-ID: <20130510000552.GX3658@sgi.com> References: <1368127405-112717-1-git-send-email-holt@sgi.com> <1368127405-112717-5-git-send-email-holt@sgi.com> <20130509135100.13947d1805a583703ee8488b@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130509135100.13947d1805a583703ee8488b@linux-foundation.org> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1270 Lines: 36 On Thu, May 09, 2013 at 01:51:00PM -0700, Andrew Morton wrote: > On Thu, 9 May 2013 14:23:18 -0500 Robin Holt 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. Robin > > > -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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/