Merge branch 'perf/urgent' into perf/core

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel.c

Merge in the latest fixes before applying new patches, resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel.c
index 2ad2374d53d4f3ee26e0815f59b081e6229f38c9,cc45deb791b01d103c01cbc527f8bfd023d51879..ffd6050a1de44dd69ec419e01c3dc8d15363dfcd
--- 1/arch/x86/kernel/cpu/perf_event_intel.c
--- 2/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@@ -157,9 -153,14 +157,16 @@@ static struct event_constraint intel_ge
  };
  
  static struct extra_reg intel_snb_extra_regs[] __read_mostly = {
-       INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3fffffffffull, RSP_0),
-       INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3fffffffffull, RSP_1),
+       INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3f807f8fffull, RSP_0),
+       INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3f807f8fffull, RSP_1),
 +      INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
++      INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
+       EVENT_EXTRA_END
+ };
+ 
+ static struct extra_reg intel_snbep_extra_regs[] __read_mostly = {
+       INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, RSP_0),
+       INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, RSP_1),
        EVENT_EXTRA_END
  };
  

diff --cc arch/x86/kernel/cpu/perf_event_intel_ds.c
Simple merge

diff --cc kernel/events/core.c
Simple merge