On Thu, Nov 29, 2012 at 02:06:51PM +1100, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in > arch/x86/kernel/ptrace.c between commit cb57a2b4cff7 ("x86-32: Export > kernel_stack_pointer() for modules") from Linus' tree and commit > 98dbec158343 ("context_tracking: New context tracking susbsystem") from > the rcu tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, thank you! Thanx, Paul > -- > Cheers, > Stephen Rothwell sfr@xxxxxxxxxxxxxxxx > > diff --cc arch/x86/kernel/ptrace.c > index 974b67e,65b88a5..0000000 > --- a/arch/x86/kernel/ptrace.c > +++ b/arch/x86/kernel/ptrace.c > @@@ -21,8 -21,7 +21,8 @@@ > #include <linux/signal.h> > #include <linux/perf_event.h> > #include <linux/hw_breakpoint.h> > - #include <linux/rcupdate.h> > +#include <linux/module.h> > + #include <linux/context_tracking.h> > > #include <asm/uaccess.h> > #include <asm/pgtable.h> -- 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