Tao Huang 640193f76b Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git ...

* linux-linaro-lsk-v4.4-android: (733 commits)
  LSK-ANDROID: memcg: Remove wrong ->attach callback
  LSK-ANDROID: arm64: mm: Fix __create_pgd_mapping() call
  ANDROID: sdcardfs: Move default_normal to superblock
  blkdev: Refactoring block io latency histogram codes
  FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
  FROMLIST: arm64: Move post_ttbr_update_workaround to C code
  FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
  sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path
  fscrypt: updates on 4.15-rc4
  ANDROID: uid_sys_stats: fix the comment
  BACKPORT: tee: indicate privileged dev in gen_caps
  BACKPORT: tee: optee: sync with new naming of interrupts
  BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
  BACKPORT: tee: optee: interruptible RPC sleep
  BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
  BACKPORT: tee.txt: standardize document format
  BACKPORT: tee: add forward declaration for struct device
  BACKPORT: tee: optee: fix uninitialized symbol 'parg'
  BACKPORT: tee: add ARM_SMCCC dependency
  BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
  ...

Conflicts:
	arch/arm64/kernel/vdso.c
	drivers/usb/host/xhci-plat.c
	include/drm/drmP.h
	include/linux/kasan.h
	kernel/time/timekeeping.c
	mm/kasan/kasan.c
	security/selinux/nlmsgtab.c

Also add this commit:
0bcdc0987cce ("time: Fix ktime_get_raw() incorrect base accumulation")

2018-01-26 19:26:47 +08:00

..

bpf

bpf, array: fix overflow in max_entries and undefined behavior in index_mask

2018-01-17 09:35:31 +01:00

configs

kconfig: tinyconfig: provide whole choice blocks to avoid warnings

2016-09-24 10:07:42 +02:00

debug

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-12-19 13:08:40 +08:00

events

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-11-20 20:53:19 +05:30

gcov

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-09-03 12:01:45 +08:00

irq

UPSTREAM: genirq/PM: Properly pretend disabled state when force resuming interrupts

2017-12-26 11:12:46 +08:00

livepatch

livepatch: x86: fix relocation computation with kASLR

2015-11-11 17:36:04 +01:00

locking

BACKPORT: kernel: add kcov code coverage

2018-01-22 13:15:43 +05:30

power

Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

2017-11-02 17:00:07 +08:00

printk

pstore/console: ignore log level

2017-11-15 14:48:58 +08:00

rcu

BACKPORT: kernel: add kcov code coverage

2018-01-22 13:15:43 +05:30

sched

Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

2018-01-26 19:26:47 +08:00

time

Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

2018-01-26 19:26:47 +08:00

trace

UPSTREAM: arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections

2018-01-22 13:15:43 +05:30

.gitignore

certs: add .gitignore to stop git nagging about x509_certificate_list

2015-10-21 15:18:35 +01:00

acct.c

kernel/acct.c: fix the acct->needcheck check in check_free_space()

2018-01-10 09:27:08 +01:00

async.c

…

audit_fsnotify.c

…

audit_tree.c

audit: audit_tree_match can be boolean

2015-11-04 08:23:51 -05:00

audit_watch.c

audit: Fix use after free in audit_remove_watch_rule()

2017-08-24 17:02:35 -07:00

audit.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-12-19 13:08:40 +08:00

audit.h

audit: audit_tree_match can be boolean

2015-11-04 08:23:51 -05:00

auditfilter.c

audit: fix comment block whitespace

2015-11-04 08:23:51 -05:00

auditsc.c

BACKPORT: audit: consistently record PIDs with task_tgid_nr()

2016-10-12 17:34:22 +05:30

backtracetest.c

…

bounds.c

…

capability.c

exec: Ensure mm->user_ns contains the execed files

2017-01-06 11:16:14 +01:00

cgroup_freezer.c

cgroup: fix handling of multi-destination migration from subtree_control enabling

2015-12-03 10:18:21 -05:00

cgroup_pids.c

cgroup_pids: don't account for the root cgroup

2015-12-03 10:18:21 -05:00

cgroup.c

Revert "cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"

2017-10-17 19:10:13 +08:00

compat.c

…

configs.c

…

context_tracking.c

context_tracking: avoid irq_save/irq_restore on guest entry and exit

2015-11-10 12:06:23 +01:00

cpu_pm.c

kernel/cpu_pm: fix cpu_cluster_pm_exit comment

2015-09-03 02:42:20 +02:00

cpu.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-01-13 12:01:52 +08:00

cpuset.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-10-13 23:14:45 +08:00

crash_dump.c

…

cred.c

cred: Reject inodes with invalid ids in set_create_file_as()

2016-09-15 08:27:49 +02:00

delayacct.c

…

dma.c

…

elfcore.c

…

exec_domain.c

…

exit.c

BACKPORT: kernel: add kcov code coverage

2018-01-22 13:15:43 +05:30

extable.c

kernel/extable.c: mark core_kernel_text notrace

2017-07-21 07:44:56 +02:00

fork.c

BACKPORT: kernel: add kcov code coverage

2018-01-22 13:15:43 +05:30

freezer.c

…

futex_compat.c

ptrace: use fsuid, fsgid, effective creds for fs access checks

2016-02-25 12:01:16 -08:00

futex.c

Merge tag 'v4.4.112' into linux-linaro-lsk-v4.4

2018-01-18 12:02:00 +08:00

groups.c

kernel: make groups_sort calling a responsibility group_info allocators

2018-01-10 09:27:10 +01:00

hung_task.c

…

irq_work.c

treewide: Remove old email address

2015-11-23 09:44:58 +01:00

jump_label.c

jump_label: Invoke jump_label_test() via early_initcall()

2017-12-16 10:33:55 +01:00

kallsyms.c

…

kcmp.c

ptrace: use fsuid, fsgid, effective creds for fs access checks

2016-02-25 12:01:16 -08:00

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

UPSTREAM: kcov: fix comparison callback signature

2018-01-22 13:15:43 +05:30

kexec_core.c

s390/kexec: consolidate crash_map/unmap_reserved_pages() and arch_kexec_protect(unprotect)_crashkres()

2017-10-25 11:26:32 +08:00

kexec_file.c

kexec: introduce a protection mechanism for the crashkernel reserved memory

2017-10-25 11:23:52 +08:00

kexec_internal.h

kexec: split kexec_file syscall code to kexec_file.c

2015-09-10 13:29:01 -07:00

kexec.c

s390/kexec: consolidate crash_map/unmap_reserved_pages() and arch_kexec_protect(unprotect)_crashkres()

2017-10-25 11:26:32 +08:00

kmod.c

kmod: don't run async usermode helper as a child of kworker thread

2015-10-23 17:55:10 +09:00

kprobes.c

tracing/kprobes: Enforce kprobes teardown after testing

2017-05-25 14:30:17 +02:00

ksysfs.c

kexec: split kexec_load syscall from kexec core code

2015-09-10 13:29:01 -07:00

kthread.c

UPSTREAM: kthread: Pin the stack via try_get_task_stack()/put_task_stack() in to_live_kthread() function

2017-08-11 19:31:04 +05:30

latencytop.c

…

Makefile

BACKPORT: kernel: add kcov code coverage

2018-01-22 13:15:43 +05:30

membarrier.c

Fix: Disable sys_membarrier when nohz_full is enabled

2017-03-12 06:37:26 +01:00

memremap.c

mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}

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

module_signing.c

KEYS: Merge the type-specific data with the payload data

2015-10-21 15:18:36 +01:00

module-internal.h

…

module.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2018-01-22 11:50:22 +05:30

notifier.c

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-09-01 08:40:25 -07:00

nsproxy.c

…

padata.c

padata: free correct variable

2017-05-20 14:27:02 +02:00

panic.c

kernel/panic.c: add missing \n

2017-07-05 14:37:19 +02:00

params.c

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-11-09 15:53:39 -08:00

pid_namespace.c

pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes

2017-05-25 14:30:11 +02:00

pid.c

pids: make task_tgid_nr_ns() safe

2017-08-24 17:02:36 -07:00

profile.c

mm: rename alloc_pages_exact_node() to __alloc_pages_node()

2015-09-08 15:35:28 -07:00

ptrace.c

ptrace: Properly initialize ptracer_cred on fork

2017-06-14 13:16:20 +02:00

range.c

…

reboot.c

i2c: rk3x: Make sure the i2c transfer to be finished before system reboot

2017-05-26 12:03:12 +08:00

relay.c

…

resource.c

/proc/iomem: only expose physical resource addresses to privileged users

2017-08-06 19:19:42 -07:00

seccomp.c

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

2017-10-05 09:41:46 +02:00

signal.c

Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

2018-01-26 19:26:47 +08:00

smp.c

mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd

2015-11-06 17:50:42 -08:00

smpboot.c

stop_machine: Kill smp_hotplug_thread->pre_unpark, introduce stop_machine_unpark()

2015-10-20 10:23:55 +02:00

smpboot.h

…

softirq.c

UPSTREAM: arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections

2018-01-22 13:15:43 +05:30

stacktrace.c

…

stop_machine.c

kernel: remove stop_machine() Kconfig dependency

2015-12-12 10:15:34 -08:00

sys_ni.c

mm: mlock: add new mlock system call

2015-11-05 19:34:48 -08:00

sys.c

BACKPORT: timer: convert timer_slack_ns from unsigned long to u64

2016-07-11 12:43:04 +05:30

sysctl_binary.c

fs/coredump: prevent fsuid=0 dumps into user-controlled directories

2016-04-12 09:08:58 -07:00

sysctl.c

cpufreq: Drop schedfreq governor

2017-11-20 21:15:59 +05:30

task_work.c

task_work: remove fifo ordering guarantee

2015-09-05 13:46:58 -07:00

taskstats.c

…

test_kprobes.c

…

torture.c

torture: Consolidate cond_resched_rcu_qs() into stutter_wait()

2015-10-06 11:25:01 -07:00

tracepoint.c

tracepoint: Give priority to probes of tracepoints

2015-10-25 21:33:54 -04:00

tsacct.c

…

uid16.c

kernel: make groups_sort calling a responsibility group_info allocators

2018-01-10 09:27:10 +01:00

up.c

…

user_namespace.c

capabilities: ambient capabilities

2015-09-04 16:54:41 -07:00

user-return-notifier.c

…

user.c

…

utsname_sysctl.c

…

utsname.c

…

watchdog.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-01-09 12:01:35 +08:00

workqueue_internal.h

workqueue: Fix NULL pointer dereference

2017-11-15 17:13:11 +01:00

workqueue.c

workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq

2017-12-16 10:33:52 +01:00