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@xxxxxxxxxxxxxxxx
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
