linux-kernel - Re: linux-next: manual merge of the rcu tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20121129221248.GF2474@linux.vnet.ibm.com>
Date:	Thu, 29 Nov 2012 14:12:48 -0800
From:	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Frederic Weisbecker <fweisbec@...il.com>,
	"H. Peter Anvin" <hpa@...ux.intel.com>
Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree

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@...b.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>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/