Hi Alex, Mark,

Please consider following linaro-android pull request for "linux-linaro-lsk-v3.18-android" LSK branch.

Boot tested on Qemu + Android M. KernelCI build job: https://kernelci.org/build/linaro-android/kernel/v3.18-6360-g6bf100b6b6dc/

Regards, Amit Pundir

The following changes since commit cb0774d2a88080ff191e8f2cfca7a53239d4fdc7:

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android (2017-01-11 09:59:22 +0800)

are available in the git repository at:

git://android.git.linaro.org/kernel/linaro-android lsk-v3.18-android

for you to fetch changes up to 6bf100b6b6dc30730db6253239cd5bd6243f0461:

DEBUG: sched/fair: Fix sched_load_avg_cpu events for task_groups (2017-01-16 16:11:00 +0530)

---------------------------------------------------------------- Brendan Jackman (2): DEBUG: sched/fair: Fix missing sched_load_avg_cpu events DEBUG: sched/fair: Fix sched_load_avg_cpu events for task_groups

Catalin Marinas (6): BACKPORT: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros BACKPORT: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1 BACKPORT: arm64: Disable TTBR0_EL1 during normal kernel execution UPSTREAM: arm64: Handle faults caused by inadvertent user access with PAN enabled UPSTREAM: arm64: xen: Enable user access before a privcmd hvc call UPSTREAM: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN

Daniel Rosenberg (1): ANDROID: mnt: remount should propagate to slaves of slaves

Eric Biggers (1): net: socket: don't set sk_uid to garbage value in ->setattr()

Eric Dumazet (1): UPSTREAM: net: avoid signed overflows for SO_{SND|RCV}BUFFORCE

Guillaume Nault (1): UPSTREAM: l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind()

Marc Zyngier (1): UPSTREAM: arm64: Disable PAN on uaccess_enable()

Mark Rutland (1): UPSTREAM: arm64: alternative: add auto-nop infrastructure

Sami Tolvanen (7): Revert "FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN" Revert "FROMLIST: arm64: xen: Enable user access before a privcmd hvc call" Revert "FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled" Revert "FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution" Revert "FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1" Revert "FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros" ANDROID: configs: CONFIG_ARM64_SW_TTBR0_PAN=y

Will Deacon (1): BACKPORT: arm64: barriers: introduce nops and __nops macros for NOP sequences

android/configs/android-recommended.cfg | 1 + arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/alternative.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- arch/arm64/include/asm/assembler.h | 9 +++++++++ arch/arm64/include/asm/barrier.h | 3 +++ arch/arm64/include/asm/efi.h | 1 + arch/arm64/include/asm/futex.h | 3 --- arch/arm64/include/asm/kernel-pgtable.h | 1 + arch/arm64/include/asm/mmu_context.h | 6 ++++-- arch/arm64/include/asm/ptrace.h | 2 -- arch/arm64/include/asm/thread_info.h | 4 ++-- arch/arm64/include/asm/uaccess.h | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- arch/arm64/kernel/armv8_deprecated.c | 1 - arch/arm64/kernel/asm-offsets.c | 6 +++--- arch/arm64/kernel/efi.c | 1 - arch/arm64/kernel/entry.S | 19 +++++++------------ arch/arm64/lib/clear_user.S | 3 --- arch/arm64/lib/copy_from_user.S | 3 --- arch/arm64/lib/copy_in_user.S | 3 --- arch/arm64/lib/copy_to_user.S | 3 --- arch/arm64/mm/cache.S | 3 +++ arch/arm64/mm/fault.c | 8 ++++---- arch/arm64/xen/hypercall.S | 8 ++------ fs/pnode.c | 27 +++++++++++++++++++++------ fs/pnode.h | 2 +- kernel/sched/fair.c | 5 ++++- net/core/sock.c | 4 ++-- net/l2tp/l2tp_ip.c | 5 +++-- net/l2tp/l2tp_ip6.c | 5 +++-- net/socket.c | 2 +- 30 files changed, 187 insertions(+), 132 deletions(-)