Dylan Reid 764212922a Merge remote-tracking branch 'android-common/android-3.14' into HEAD ...

* android-common/android-3.14: (587 commits)
  input: evdev: fix double free in evdev_release
  xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk()
  android: base-cfg: enable ARMV8_DEPRECATED and subfeatures
  arm64: kconfig: move emulation option under kernel features
  kbuild: make it possible to specify the module output dir
  arm64: Emulate SETEND for AArch32 tasks
  arm64: Consolidate hotplug notifier for instruction emulation
  arm64: kernel: explicitly add include in armv8_deprecated
  arm64: Track system support for mixed endian EL0
  arm64: Fix up /proc/cpuinfo
  arm64: cpuinfo: record cpu system register values
  arm64: add MIDR_EL1 field accessors
  arm64: fix return code check when changing emulation handler
  arm64: Trace emulation of AArch32 legacy instructions
  arm64: Emulate CP15 Barrier instructions
  arm64: barriers: add dmb barrier
  arm64: Port SWP/SWPB emulation support from arm
  arm64: Add framework for legacy instruction emulation
  arm64: Add AArch32 instruction set condition code checks
  arm64: Add support for hooks to handle undefined instructions
  ...

Reviewed-by: Olof Johansson <olofj@chromium.org>
Signed-off-by: Dylan Reid <dgreid@chromium.org>

Conflicts:
	Documentation/cpu-freq/governors.txt
	arch/arm/boot/dts/Makefile
	arch/arm/include/uapi/asm/unistd.h
	arch/arm/kernel/calls.S
	arch/arm/kernel/process.c
	arch/arm64/Kconfig
	arch/arm64/boot/dts/Makefile
	arch/arm64/crypto/Makefile
	arch/arm64/crypto/aes-glue.c
	arch/arm64/include/asm/barrier.h
	arch/arm64/include/asm/compat.h
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/ptrace.h
	arch/arm64/include/asm/seccomp.h
	arch/arm64/include/asm/thread_info.h
	arch/arm64/include/asm/unistd32.h
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/ptrace.c
	arch/arm64/kernel/setup.c
	arch/arm64/kernel/signal32.c
	arch/x86/syscalls/syscall_32.tbl
	arch/x86/syscalls/syscall_64.tbl
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq_interactive.c
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/f_rndis.c
	fs/pstore/ram.c
	include/asm-generic/seccomp.h
	include/linux/amba/mmci.h
	include/trace/events/cpufreq_interactive.h
	kernel/futex.c
	kernel/seccomp.c
	kernel/sys.c

2015-03-02 14:15:03 -08:00

..

blktrace.c

UPSTREAM: tracing: Pass trace_array to set_flag callback

2014-08-08 03:07:32 +00:00

ftrace.c

UPSTREAM: ftrace: Do not pass data to ftrace_dyn_arch_init

2014-08-08 19:50:45 +00:00

gpu-traces.c

trace/events: add gpu trace events

2014-03-19 13:09:55 -07:00

Kconfig

trace/events: add gpu trace events

2014-03-19 13:09:55 -07:00

Makefile

trace/events: add gpu trace events

2014-03-19 13:09:55 -07:00

power-traces.c

PM / tracing: remove deprecated power trace API

2013-01-26 00:39:12 +01:00

ring_buffer_benchmark.c

tracing: Use NUMA allocation for per-cpu ring buffer pages

2011-06-14 22:04:39 -04:00

ring_buffer.c

ring-buffer: Fix first commit on sub-buffer having non-zero delta

2014-02-11 13:38:54 -05:00

rpm-traces.c

PM / Runtime: Introduce trace points for tracing rpm_* functions

2011-09-27 22:53:27 +02:00

trace_branch.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_clock.c

tracing: Add "uptime" trace clock that uses jiffies

2013-03-15 00:36:09 -04:00

trace_entries.h

tracing: Add trace_puts() for even faster trace_printk() tracing

2013-03-15 00:35:55 -04:00

trace_event_perf.c

perf/trace: Properly use u64 to hold event_id

2013-11-19 16:57:44 +01:00

trace_events_filter_test.h

tracing/filter: Add startup tests for events filter

2011-08-19 14:35:59 -04:00

trace_events_filter.c

tracing: Add and use generic set_trigger_filter() implementation

2013-12-21 22:02:17 -05:00

trace_events_trigger.c

tracing: Show available event triggers when no trigger is set

2014-01-09 21:20:32 -05:00

trace_events.c

tracing: Fix array size mismatch in format string

2014-03-20 13:21:05 -04:00

trace_export.c

tracing: Fix array size mismatch in format string

2014-03-20 13:21:05 -04:00

trace_functions_graph.c

Merge remote-tracking branch 'android-common/android-3.14' into HEAD

2015-03-02 14:15:03 -08:00

trace_functions.c

UPSTREAM: ftrace: Allow for function tracing instance to filter functions

2014-08-08 03:08:09 +00:00

trace_irqsoff.c

UPSTREAM: tracing: Pass trace_array to set_flag callback

2014-08-08 03:07:32 +00:00

trace_kdb.c

tracing: Consolidate max_tr into main trace_array structure

2013-03-15 00:35:40 -04:00

trace_kprobe.c

tracing: Consolidate event trigger code

2014-01-09 21:20:07 -05:00

trace_mmiotrace.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_nop.c

UPSTREAM: tracing: Set up infrastructure to allow tracers for instances

2014-08-08 03:07:40 +00:00

trace_output.c

trace: add non-hierarchical function_graph option

2014-03-19 13:09:57 -07:00

trace_output.h

tracing: Rename trace_event_mutex to trace_event_sem

2013-03-15 13:22:10 -04:00

trace_printk.c

tracing: Add __tracepoint_string() to export string pointers

2013-07-26 13:39:44 -04:00

trace_probe.c

tracing/uprobes: Add @+file_offset fetch method

2014-01-02 20:57:05 -05:00

trace_probe.h

tracing/probes: Fix build break on !CONFIG_KPROBE_EVENT

2014-01-03 15:27:18 -05:00

trace_sched_switch.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_sched_wakeup.c

UPSTREAM: tracing: Pass trace_array to set_flag callback

2014-08-08 03:07:32 +00:00

trace_selftest_dynamic.c

ftrace: Add self-tests for multiple function trace users

2011-05-18 19:24:51 -04:00

trace_selftest.c

sched/deadline: Add latency tracing for SCHED_DEADLINE tasks

2014-01-13 13:41:11 +01:00

trace_stack.c

tracing: Add generic tracing_lseek() function

2014-01-02 16:17:12 -05:00

trace_stat.c

trace/trace_stat: use rbtree postorder iteration helper instead of opencoding

2013-11-05 16:01:47 -05:00

trace_stat.h

tracing/stat: Add stat_release() callback

2009-07-10 12:14:05 +02:00

trace_syscalls.c

tracing: Consolidate event trigger code

2014-01-09 21:20:07 -05:00

trace_uprobe.c

tracing/probes: Fix build break on !CONFIG_KPROBE_EVENT

2014-01-03 15:27:18 -05:00

trace.c

Merge remote-tracking branch 'android-common/android-3.14' into HEAD

2015-03-02 14:15:03 -08:00

trace.h

Merge remote-tracking branch 'android-common/android-3.14' into HEAD

2015-03-02 14:15:03 -08:00