linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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"

Attachment: pgp00000.pgp
Description: PGP signature