Merge branch 'perf/urgent' into perf/core, to resolve conflict

 Conflicts:
	arch/x86/events/intel/pt.c

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

diff --cc arch/x86/events/intel/lbr.c
Simple merge

diff --cc arch/x86/events/intel/pt.c
index 1aefd43,09a77db..05ef87d
--- 1/arch/x86/events/intel/pt.c
--- 2/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@@ -969,18 -1038,15 +1018,21 @@@ EXPORT_SYMBOL_GPL(intel_pt_handle_vmx)
  
  static void pt_event_start(struct perf_event *event, int mode)
  {
 +      struct hw_perf_event *hwc = &event->hw;
        struct pt *pt = this_cpu_ptr(&pt_ctx);
 -      struct pt_buffer *buf = perf_get_aux(&pt->handle);
 +      struct pt_buffer *buf;
  
 -      if (!buf || pt_buffer_is_full(buf, pt)) {
 -              event->hw.state = PERF_HES_STOPPED;
 -              return;
+       if (READ_ONCE(pt->vmx_on))
+               return;
+ 
 +      buf = perf_aux_output_begin(&pt->handle, event);
 +      if (!buf)
 +              goto fail_stop;
 +
 +      pt_buffer_reset_offsets(buf, pt->handle.head);
 +      if (!buf->snapshot) {
 +              if (pt_buffer_reset_markers(buf, &pt->handle))
 +                      goto fail_end_stop;
        }
  
        ACCESS_ONCE(pt->handle_nmi) = 1;

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