From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Frederic Weisbecker <fweisbec@gmail.com>,
"H. Peter Anvin" <hpa@linux.intel.com>
Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree
Date: Thu, 29 Nov 2012 14:12:48 -0800 [thread overview]
Message-ID: <20121129221248.GF2474@linux.vnet.ibm.com> (raw)
In-Reply-To: <20121129140651.33881363cc4870a87cf84adc@canb.auug.org.au>
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@canb.auug.org.au
>
> 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>
next prev parent reply other threads:[~2012-11-29 22:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-29 3:06 linux-next: manual merge of the rcu tree with Linus' tree Stephen Rothwell
2012-11-29 22:12 ` Paul E. McKenney [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-17 22:41 Stephen Rothwell
2022-10-18 18:38 ` Paul E. McKenney
2022-07-08 4:12 Stephen Rothwell
2022-07-08 15:23 ` Paul E. McKenney
2018-06-12 0:46 Stephen Rothwell
2018-06-12 1:01 ` Paul E. McKenney
2018-06-18 3:48 ` Stephen Rothwell
2018-06-18 3:49 ` Stephen Rothwell
2018-06-18 14:48 ` Paul E. McKenney
2018-05-14 3:46 Stephen Rothwell
2018-05-15 17:44 ` Paul E. McKenney
2017-09-26 3:00 Stephen Rothwell
2017-09-26 3:26 ` Paul E. McKenney
2017-09-26 3:42 ` Stephen Rothwell
2017-03-08 0:46 Stephen Rothwell
2017-03-08 0:56 ` Stephen Rothwell
2016-03-30 0:32 Stephen Rothwell
2016-03-30 10:30 ` Paul E. McKenney
2016-03-30 0:23 Stephen Rothwell
2012-08-06 2:31 Stephen Rothwell
2011-09-27 6:04 Stephen Rothwell
2011-09-27 12:20 ` Frederic Weisbecker
2011-09-27 5:14 Stephen Rothwell
2011-09-27 13:14 ` Borislav Petkov
2010-10-06 2:38 Stephen Rothwell
2010-10-06 4:17 ` Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121129221248.GF2474@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=fweisbec@gmail.com \
--cc=hpa@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).