linux-kernel - linux-next: manual merge of the uprobes tree with the tip 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Tue, 13 Mar 2012 16:41:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Srikar Dronamraju <srikar@...ux.vnet.ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stephane Eranian <eranian@...gle.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the uprobes tree with the tip tree

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflict in
arch/x86/kernel/cpu/perf_event_intel_ds.c between commit 3e702ff6d1ea
("perf/x86: Add LBR software filter support for Intel CPUs") from the tip
tree and commit 1e1e2cddc33d ("x86/trivial: use is_ia32_compat_task")
from the uprobes tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/kernel/cpu/perf_event_intel_ds.c
index 7f64df1,92e7dee4..0000000
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@@ -3,7 -3,7 +3,8 @@@
  #include <linux/slab.h>
  
  #include <asm/perf_event.h>
 +#include <asm/insn.h>
+ #include <asm/compat.h>
  
  #include "perf_event.h"
  

Content of type "application/pgp-signature" skipped