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

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Makefile
index 285b32fa41c11a4e81ea1663f69946b8486bd881,304dcc3da06f5f5d238f77a183c940607296f31a..14c74a66c58e39da78705c74631aa390f15bb458
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -27,8 -31,8 +31,9 @@@ $(warning LSE atomics not supported by 
  endif
  
  KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr)
 +KBUILD_CFLAGS += -fno-pic
  KBUILD_CFLAGS += $(call cc-option, -mpc-relative-literal-loads)
+ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
  KBUILD_AFLAGS += $(lseinstr)
  
  ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/mm/dma-mapping.c
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc block/partition-generic.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/of/fdt.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

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

diff --cc include/linux/cgroup-defs.h
Simple merge

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

diff --cc kernel/cgroup.c
Simple merge

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

diff --cc mm/memcontrol.c
index 7535ef32a75ba423f3d777bbe79d4bc159ff2c8a,6ba4dd988e2e49b1ede4105d5efbcb19e9f3864e..d1f6dc5a715d8349313d54a75dc1017c0543d5f3
--- 1/mm/memcontrol.c
--- 2/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -5267,8 -5259,7 +5268,9 @@@ struct cgroup_subsys memory_cgrp_subsy
        .css_reset = mem_cgroup_css_reset,
        .can_attach = mem_cgroup_can_attach,
        .cancel_attach = mem_cgroup_cancel_attach,
 +      .attach = mem_cgroup_move_task,
 +      .allow_attach = mem_cgroup_allow_attach,
+       .post_attach = mem_cgroup_move_task,
        .bind = mem_cgroup_bind,
        .dfl_cftypes = memory_files,
        .legacy_cftypes = mem_cgroup_legacy_files,

diff --cc mm/vmscan.c
Simple merge