From mboxrd@z Thu Jan  1 00:00:00 1970
From: Don Zickus <dzickus@redhat.com>
Subject: Re: linux-next: manual merge of the tip tree with the kgdb tree
Date: Fri, 14 May 2010 10:00:43 -0400
Message-ID: <20100514140043.GP15159@redhat.com>
References: <20100514141406.68a6bf6f.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:23616 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752032Ab0ENOCD (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Fri, 14 May 2010 10:02:03 -0400
Content-Disposition: inline
In-Reply-To: <20100514141406.68a6bf6f.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Wessel <jason.wessel@windriver.com>

On Fri, May 14, 2010 at 02:14:06PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> kernel/Makefile between commit 7d63ecbc5ce463c8ba60e357eafaf47774521f1a
> ("Move kernel/kgdb.c to kernel/debug/debug_core.c") from the kgdb tree
> and commit 58687acba59266735adb8ccd9b5b9aa2c7cd205b ("lockup_detector:
> Combine nmi_watchdog and softlockup detector") from the tip tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> as necessary.

ACK

for the LOCK_DETECTOR and SOFTLOCKUP parts.

Cheers,
Don

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc kernel/Makefile
> index 4313d0e,34d123b..0000000
> --- a/kernel/Makefile
> +++ b/kernel/Makefile
> @@@ -68,17 -68,16 +68,17 @@@ obj-$(CONFIG_USER_NS) += user_namespace
>   obj-$(CONFIG_PID_NS) += pid_namespace.o
>   obj-$(CONFIG_IKCONFIG) += configs.o
>   obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
> - obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
> + obj-$(CONFIG_SMP) += stop_machine.o
>   obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
>  -obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o
>  +obj-$(CONFIG_AUDIT) += audit.o auditfilter.o
>   obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
>  -obj-$(CONFIG_GCOV_KERNEL) += gcov/
>  +obj-$(CONFIG_AUDIT_WATCH) += audit_watch.o
>   obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
>  +obj-$(CONFIG_GCOV_KERNEL) += gcov/
>   obj-$(CONFIG_KPROBES) += kprobes.o
>  -obj-$(CONFIG_KGDB) += kgdb.o
>  +obj-$(CONFIG_KGDB) += debug/
> - obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
>   obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
> + obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o
>   obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
>   obj-$(CONFIG_SECCOMP) += seccomp.o
>   obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o