Zhang Bo c96ae9f146 Merge branch 'android-4.9' into imx_4.9.y ...

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	drivers/mmc/card/Kconfig
	drivers/mmc/card/queue.c
	drivers/mmc/card/queue.h
	drivers/mmc/core/Kconfig
	drivers/mmc/core/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/host.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sdio.c
	drivers/staging/android/Kconfig
	drivers/usb/chipidea/otg.c
	include/linux/mmc/core.h
	include/linux/mmc/host.h
	include/linux/mmc/mmc.h
	kernel/sched/cpufreq_schedutil.c

Change-Id: I4dbf6f884a251dffa61ef7271f5c37293b764c94

2017-12-11 20:20:40 +08:00

..

bpf

Merge 4.9.55 into android-4.9

2017-10-12 22:31:24 +02:00

configs

ANDROID: add script to fetch android kernel config fragments

2017-10-03 17:19:26 +00:00

debug

Merge tag 'v4.9.6' into android-4.9

2017-01-31 13:55:27 -08:00

events

Merge 4.9.55 into android-4.9

2017-10-12 22:31:24 +02:00

gcov

gcov: support GCC 7.1

2017-09-02 07:07:53 +02:00

irq

genirq: Make sparse_irq_lock protect what it should protect

2017-10-05 09:43:58 +02:00

livepatch

…

locking

locktorture: Fix potential memory leak with rw lock test

2017-09-13 14:13:36 -07:00

power

Merge 4.9.55 into android-4.9

2017-10-12 22:31:24 +02:00

printk

Merge branch 'android-4.9' into imx_4.9.y

2017-12-11 20:20:40 +08:00

rcu

rcu: Add memory barriers for NOCB leader wakeup

2017-07-21 07:42:22 +02:00

sched

Merge 4.9.55 into android-4.9

2017-10-12 22:31:24 +02:00

time

Merge branch 'android-4.9' into imx_4.9.y

2017-12-11 20:20:40 +08:00

trace

Merge branch 'android-4.9' into imx_4.9.y

2017-12-11 20:20:40 +08:00

.gitignore

…

acct.c

…

async.c

…

audit_fsnotify.c

…

audit_tree.c

…

audit_watch.c

audit: Fix use after free in audit_remove_watch_rule()

2017-08-24 17:12:18 -07:00

audit.c

…

audit.h

…

auditfilter.c

…

auditsc.c

…

backtracetest.c

…

bounds.c

…

capability.c

ptrace: Capture the ptracer's creds not PT_PTRACE_CAP

2017-01-06 10:40:13 +01:00

cgroup_freezer.c

…

cgroup_pids.c

cgroup/pids: remove spurious suspicious RCU usage warning

2017-03-26 13:05:58 +02:00

cgroup.c

Merge 4.9.42 into android-4.9

2017-08-11 13:55:02 -07:00

compat.c

…

configs.c

…

context_tracking.c

…

cpu_pm.c

…

cpu.c

Move x86_64 idle notifiers to generic

2017-10-04 20:34:13 +03:00

cpuset.c

Merge 4.9.55 into android-4.9

2017-10-12 22:31:24 +02:00

crash_dump.c

…

cred.c

…

delayacct.c

…

dma.c

…

elfcore.c

…

exec_domain.c

…

exit.c

ANDROID: FIXUP: sched/tune: fix accounting for runnable tasks

2017-01-31 10:46:56 -08:00

extable.c

kernel/extable.c: mark core_kernel_text notrace

2017-07-21 07:42:21 +02:00

fork.c

mm, uprobes: fix multiple free of ->uprobes_state.xol_area

2017-09-07 08:35:39 +02:00

freezer.c

…

futex_compat.c

…

futex.c

futex: Remove unnecessary warning from get_futex_key

2017-08-16 13:43:15 -07:00

groups.c

…

hung_task.c

…

irq_work.c

…

jump_label.c

jump_labels: API for flushing deferred jump label updates

2017-01-19 20:17:59 +01:00

kallsyms.c

…

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

kcov: add missing #include <linux/sched.h>

2016-12-07 17:10:00 -08:00

kexec_core.c

…

kexec_file.c

…

kexec_internal.h

…

kexec.c

…

kmod.c

…

kprobes.c

tracing/kprobes: Enforce kprobes teardown after testing

2017-05-25 15:44:47 +02:00

ksysfs.c

…

kthread.c

cgroup, kthread: close race window where new kthreads can be migrated to non-root cgroups

2017-04-21 09:31:18 +02:00

latencytop.c

…

Makefile

kernel/watchdog.c: move hardlockup detector to separate file

2017-06-17 06:41:57 +02:00

membarrier.c

Fix: Disable sys_membarrier when nohz_full is enabled

2017-03-12 06:41:45 +01:00

memremap.c

mm, devm_memremap_pages: hold device_hotplug lock over mem_hotplug_{begin, done}

2017-03-12 06:41:43 +01:00

module_signing.c

…

module-internal.h

…

module.c

Re-enable CONFIG_MODVERSIONS in a slightly weaker form

2016-11-29 16:01:30 -08:00

notifier.c

…

nsproxy.c

…

padata.c

padata: free correct variable

2017-05-20 14:28:40 +02:00

panic.c

kernel/panic.c: add missing \n

2017-07-05 14:40:24 +02:00

params.c

…

pid_namespace.c

pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes

2017-05-25 15:44:38 +02:00

pid.c

pids: make task_tgid_nr_ns() safe

2017-08-24 17:12:21 -07:00

profile.c

…

ptrace.c

ptrace: Properly initialize ptracer_cred on fork

2017-06-14 15:05:54 +02:00

range.c

…

reboot.c

…

relay.c

relay: check array offset before using it

2017-01-12 11:39:30 +01:00

resource.c

…

seccomp.c

seccomp: fix the usage of get/put_seccomp_filter() in seccomp_get_filter()

2017-10-05 09:44:02 +02:00

signal.c

signal: protect SIGNAL_UNKILLABLE from unintentional clearing.

2017-08-11 08:49:36 -07:00

smp.c

…

smpboot.c

…

smpboot.h

…

softirq.c

…

stacktrace.c

stacktrace, lockdep: Fix address, newline ugliness

2017-02-14 15:25:42 -08:00

stop_machine.c

…

sys_ni.c

…

sys.c

ANDROID: mm: add a field to store names for private anonymous memory

2017-01-27 13:52:21 -08:00

sysctl_binary.c

…

sysctl.c

Merge 4.9.53 into android-4.9

2017-10-05 10:37:37 +02:00

task_work.c

…

taskstats.c

taskstats: fix the length of cgroupstats_cmd_get_policy

2016-11-03 16:55:58 -04:00

test_kprobes.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

ucount.c

kernel/ucount.c: mark user_header with kmemleak_ignore()

2017-06-17 06:41:51 +02:00

uid16.c

…

up.c

…

user_namespace.c

…

user-return-notifier.c

…

user.c

…

utsname_sysctl.c

…

utsname.c

…

watchdog_hld.c

kernel/watchdog: prevent false hardlockup on overloaded system

2017-06-17 06:41:57 +02:00

watchdog.c

Revert "ANDROID: hardlockup: detect hard lockups without NMIs using secondary cpus"

2017-06-27 10:31:16 +02:00

workqueue_internal.h

…

workqueue.c

workqueue: implicit ordered attribute should be overridable

2017-08-11 08:49:37 -07:00