Hi Alex, Mark,
Please consider following linaro-android pull request for "linux-linaro-lsk-v4.1-android" LSK branch.
Boot tested on Qemu + Android M. KernelCI build job: https://kernelci.org/build/linaro-android/kernel/v4.1-5317-g65117109f634/
Backlog: Again, for the record, here is a list of aosp/android-4.1 patches dropped from lsk-4.1-android topic branch. "arm64: User Access Override" feature and dependent patches from aosp/android-4.1 are dropped due to non-trivial merge errors including a "#define" conflict in one of arm64:UAO patches which might have made that feature unusable.
BACKPORT: arm64: kernel: Add support for User Access Override UPSTREAM: arm64: cpufeature: Test 'matches' pointer to find the end of the list BACKPORT: arm64: kernel: Don't toggle PAN on systems with UAO UPSTREAM: arm64: Remove the get_thread_info() function UPSTREAM: arm64: fix dump_instr when PAN and UAO are in use UPSTREAM: arm64: add macro to extract ESR_ELx.EC UPSTREAM: arm64: kill ESR_LNX_EXEC BACKPORT: arm64: kernel: Save and restore UAO and addr_limit on exception entry BACKPORT: arm64: Handle el1 synchronous instruction aborts cleanly 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 UPSTREAM: arm64: Disable PAN on uaccess_enable() ANDROID: configs: CONFIG_ARM64_SW_TTBR0_PAN=y
Regards, Amit Pundir
The following changes since commit 8b496701188f07a1c4821d833337e4a0998191b9:
Merge branch 'lsk-v4.1-android' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v4.1-android (2017-01-03 17:57:57 +0800)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android lsk-v4.1-android
for you to fetch changes up to 65117109f6344fa46542f85844bc292842116192:
ANDROID: sdcardfs: Propagate dentry down to inode_change_ok() (2017-01-16 15:54:02 +0530)
---------------------------------------------------------------- Amit Pundir (1): ANDROID: sdcardfs: Propagate dentry down to inode_change_ok()
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()
Mark Rutland (1): UPSTREAM: arm64: alternative: add auto-nop infrastructure
Sami Tolvanen (2): Revert "FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN" Revert "FROMLIST: arm64: xen: Enable user access before a privcmd hvc call"
Will Deacon (1): BACKPORT: arm64: barriers: introduce nops and __nops macros for NOP sequences
arch/arm64/Kconfig | 8 -------- arch/arm64/include/asm/alternative.h | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- arch/arm64/include/asm/assembler.h | 9 +++++++++ arch/arm64/include/asm/barrier.h | 3 +++ arch/arm64/xen/hypercall.S | 19 ------------------- fs/sdcardfs/inode.c | 4 ++-- net/core/sock.c | 4 ++-- net/l2tp/l2tp_ip.c | 5 +++-- net/l2tp/l2tp_ip6.c | 5 +++-- net/socket.c | 2 +- 10 files changed, 77 insertions(+), 53 deletions(-)
pulled and pushed
Thanks!
On 01/19/2017 10:22 PM, Amit Pundir wrote:
The following changes since commit 8b496701188f07a1c4821d833337e4a0998191b9:
Merge branch 'lsk-v4.1-android' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v4.1-android (2017-01-03 17:57:57 +0800)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android lsk-v4.1-android
linaro-kernel@lists.linaro.org