Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	tools/perf/Makefile

diff --cc CREDITS
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/include/asm/msr-index.h
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/acpi/sleep.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/irq.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/mm_types.h
Simple merge

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

diff --cc kernel/time/tick-sched.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc tools/perf/Makefile
index 0a619af5be4377fd395dc1b638b40d095d9d7cdd,cca5bb8334adf85df4050ef90ce2bef47611cc2b..55b83f21266d7fffab1ef79775fcc808621d9e07
--- 1/tools/perf/Makefile
--- 2/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@@ -169,36 -169,16 +169,43 @@@ endi
  
  ### --- END CONFIGURATION SECTION ---
  
 -BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -Iutil -I. -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 +ifeq ($(srctree),)
 +srctree := $(patsubst %/,%,$(dir $(shell pwd)))
 +srctree := $(patsubst %/,%,$(dir $(srctree)))
 +#$(info Determined 'srctree' to be $(srctree))
 +endif
 +
 +ifneq ($(objtree),)
 +#$(info Determined 'objtree' to be $(objtree))
 +endif
 +
 +ifneq ($(OUTPUT),)
 +#$(info Determined 'OUTPUT' to be $(OUTPUT))
 +endif
 +
 +BASIC_CFLAGS = \
 +      -Iutil/include \
 +      -Iarch/$(ARCH)/include \
 +      $(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \
 +      -I$(srctree)/arch/$(ARCH)/include/uapi \
 +      -I$(srctree)/arch/$(ARCH)/include \
 +      $(if $(objtree),-I$(objtree)/include/generated/uapi) \
 +      -I$(srctree)/include/uapi \
 +      -I$(srctree)/include \
 +      -I$(OUTPUT)util \
 +      -Iutil \
 +      -I. \
 +      -I$(TRACE_EVENT_DIR) \
 +      -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
  BASIC_LDFLAGS =
  
+ ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)
+       BIONIC := 1
+       EXTLIBS := $(filter-out -lrt,$(EXTLIBS))
+       EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))
+       BASIC_CFLAGS += -I.
+ endif
+ 
  # Guard against environment variables
  BUILTIN_OBJS =
  LIB_H =

diff --cc tools/perf/builtin-kvm.c
index 283b4397e397fdd3155c4bcf11b23caeeb2bb139,836c82f0137176fb05f80bacab5e47c2b726593e..ca3f80ebc100ce271007940cf32a4f16856f1628
--- 1/tools/perf/builtin-kvm.c
--- 2/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@@ -312,11 -311,11 +312,11 @@@ struct vcpu_event_record 
  };
  
  
 -static void init_kvm_event_record(struct perf_kvm *kvm)
 +static void init_kvm_event_record(struct perf_kvm_stat *kvm)
  {
-       int i;
+       unsigned int i;
  
-       for (i = 0; i < (int)EVENTS_CACHE_SIZE; i++)
+       for (i = 0; i < EVENTS_CACHE_SIZE; i++)
                INIT_LIST_HEAD(&kvm->kvm_events_cache[i]);
  }
  

diff --cc tools/perf/perf.h
Simple merge

diff --cc tools/perf/tests/builtin-test.c
Simple merge

diff --cc tools/perf/tests/parse-events.c
Simple merge

diff --cc tools/perf/util/header.h
Simple merge

diff --cc tools/perf/util/parse-events.c
Simple merge

diff --cc tools/perf/util/parse-events.h
Simple merge

diff --cc tools/perf/util/session.h
Simple merge