Hi Alex, Mark,

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

KernelCI link is down so build tested locally for arm(vexpress defconfig + android configs), and arm64(defconfig + android configs).

Boot tested on Qemu(vexpress defconfig + android config fragments) + Android M userspace.

Also fixed few lsk-v3.18-android build errors reported on KernelCI last time.

Regards, Amit Pundir

The following changes since commit 1203868ffa16d93234dc005fba95b6596b87ddb5:

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android (2017-02-09 16:21:25 +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 a9cc70977784f91accde7515f58a90f5b47a1d30:

UPSTREAM: ARM: 8408/1: Fix the secondary_startup function in Big Endian case (2017-04-10 17:51:05 +0530)

---------------------------------------------------------------- Adrien Schildknecht (5): Squashfs: remove the FILE_CACHE option Squashfs: refactor page_actor Squashfs: replace buffer_head with BIO Squashfs: implement .readpages() Squashfs: optimize reading uncompressed data

Amit Pundir (15): ANDROID: binder: fix format specifier for type binder_size_t Revert "net: sysctl_net_core: Fix warning: 'one' defined but not used" ANDROID: base-cfg: enable CONFIG_IP_NF_NAT Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested." Revert "net: fix crash in tcp_nuke_addr()" Revert "net: fix iterating over hashtable in tcp_nuke_addr()" Revert "tcp: Fix build error if IPV6 is not selected" Revert "net: tcp: fix rtable leak in tcp_is_local[6]" Revert "export tcp_nuke_addr to build ipv6 as module" Revert "tcp: Silence warning: ‘in’ may be used uninitialized" Revert "net: socket ioctl to reset connections matching local address" Revert "panic: Add board ID to panic output" Revert "arm: dcc_tty: fix armv6 dcc tty build failure" Revert "[ARM] armv6 dcc tty driver" arm: vdso: Rename timekeeper::tkr to timekeeper::tkr_mono

Anson Jacob (1): usb: gadget: f_accessory: Fix for UsbAccessory clean unbind.

Anurag Singh (1): input: evdev: Move wake_lock_destroy call

Arnd Bergmann (1): UPSTREAM: arm64: build vdso without libgcov

Baruch Siach (1): crypto: arm - ignore generated SHA2 assembly files

Borislav Petkov (1): config/android: Remove CONFIG_IPV6_PRIVACY

Bowgo Tsai (1): ANDROID: dm: android-verity: allow disable dm-verity for Treble VTS

Chen Gang (1): UPSTREAM: mm: add PHYS_PFN, use it in __phys_to_pfn()

Chenbo Feng (1): ANDROID: fix the deadlock in xt_qtaguid when enable DDEBUG

Chris Redpath (1): cpufreq: interactive governor drops bits in time calculation

Christoph Hellwig (1): UPSTREAM: mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h

Daniel Rosenberg (31): ANDROID: sdcardfs: Fix incorrect hash ANDROID: sdcardfs: Add missing path_put ANDROID: sdcardfs: Don't bother deleting freelist ANDROID: sdcardfs: implement vm_ops->page_mkwrite ANDROID: sdcardfs: support direct-IO (DIO) operations ANDROID: sdcardfs: Fix case insensitive lookup ANDROID: sdcardfs: rate limit warning print ANDROID: sdcardfs: Replace get/put with d_lock ANDROID: sdcardfs: Use spin_lock_nested ANDROID: sdcardfs: Switch to internal case insensitive compare ANDROID: sdcardfs: Use d_invalidate instead of drop_recurisve ANDROID: sdcardfs: Get the blocksize from the lower fs ANDROID: sdcardfs: declare MODULE_ALIAS_FS ANDROID: sdcardfs: Use case insensitive hash function ANDROID: sdcardfs: move path_put outside of spinlock ANDROID: sdcardfs: Remove uninformative prints ANDROID: sdcardfs: Use tabs instead of spaces in multiuser.h ANDROID: sdcardfs: Fix gid issue ANDROID: sdcardfs: correct order of descriptors ANDROID: sdcardfs: Fix formatting ANDROID: sdcardfs: Fix style issues with comments ANDROID: sdcardfs: remove unneeded null check ANDROID: sdcardfs: Use pr_[...] instead of printk ANDROID: sdcardfs: Use to kstrout ANDROID: sdcardfs: Use seq_puts over seq_printf ANDROID: sdcardfs: Fix style issues in macros ANDROID: sdcardfs: remove unnecessary call to do_munmap ANDROID: sdcardfs: copy lower inode attributes in ->ioctl ANDROID: sdcardfs: fix ->llseek to update upper and lower offset ANDROID: sdcardfs: add read_iter/write_iter opeations ANDROID: sdcardfs: use d_splice_alias

Dmitry Shmidt (1): android: base-cfg: Add CONFIG_INET_DIAG_DESTROY

Greg Hackmann (1): ANDROID: sched: fix duplicate sched_group_energy const specifiers

Greg Kroah-Hartman (4): ANDROID: android-base.cfg: properly sort the file ANDROID: android-base.cfg: add CONFIG_IKCONFIG option ANDROID: android-base.cfg: add CONFIG_MODULES option ANDROID: android-base.cfg: enable UID_SYS_STATS

Gregory CLEMENT (1): UPSTREAM: ARM: 8408/1: Fix the secondary_startup function in Big Endian case

Jin Qian (10): ANDROID: uid_cputime: add per-uid IO usage accounting ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c ANDROID: uid_sys_stats: allow writing same state ANDROID: uid_sys_stats: return full size when state is not changed. ANDROID: uid_sys_stats: remove unnecessary code in procstat switch ANDROID: uid_sys_stats: fix negative write bytes. ANDROID: sched: add a counter to track fsync ANDROID: uid_sys_stats: account for fsync syscalls uid_sys_stats: fix typo in init ANDROID: mmc: core: export emmc revision

Jisheng Zhang (3): UPSTREAM: ARM: 8597/1: VDSO: put RO and RO after init objects into proper sections UPSTREAM: arm64: vdso: add __init section marker to alloc_vectors_page UPSTREAM: arm64: vdso: constify vm_special_mapping used for aarch32 vectors page

Joel Scherpelz (1): net: ipv6: Add sysctl for minimum prefix len acceptable in RIOs.

Jungseung Lee (1): BACKPORT: mmc: core: Export device lifetime information through sysfs

Kees Cook (1): net: ping: check minimum size on ICMP header length

Kevin Brodsky (3): BACKPORT: arm64: fix vdso-offsets.h dependency UPSTREAM: arm64: Refactor vDSO time functions UPSTREAM: arm64: Add support for CLOCK_MONOTONIC_RAW in clock_gettime() vDSO

Lianwei Wang (1): Revert "drivers: power: Add watchdog timer to catch drivers which lockup during suspend."

Lisa Du (1): UPSTREAM: drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE

Maciej Żenczykowski (1): UPSTREAM: ipv6 addrconf: implement RFC7559 router solicitation backoff

Martijn Coenen (4): binder: use group leader instead of open thread android: binder: add padding to binder_fd_array_object. android: binder: move global binder state into context struct. ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.

Masahiro Yamada (1): UPSTREAM: kbuild: drop FORCE from PHONY targets

Max Shi (1): config: disable CONFIG_USELIB and CONFIG_FHANDLE

Michael Halcrow (1): ANDROID: ext4 crypto: Disables zeroing on truncation when there's no key

Min Chong (1): netfilter: Change %p to %pK in debug messages

Mohan Srinivasan (2): ANDROID: Refactor fs readpage/write tracepoints. ANDROID: Replace spaces by '_' for some android filesystem tracepoints.

Nathan Lynch (11): UPSTREAM: ARM: 8329/1: miscellaneous vdso infrastructure, preparation UPSTREAM: ARM: 8330/1: add VDSO user-space code BACKPORT: ARM: 8331/1: VDSO initialization, mapping, and synchronization UPSTREAM: ARM: 8332/1: add CONFIG_VDSO Kconfig and Makefile bits UPSTREAM: ARM: 8342/1: VDSO: depend on CPU_V7 UPSTREAM: ARM: 8343/1: VDSO: add build artifacts to .gitignore UPSTREAM: ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile UPSTREAM: ARM: 8385/1: VDSO: group link options UPSTREAM: ARM: 8384/1: VDSO: force use of BFD linker UPSTREAM: ARM: 8405/1: VDSO: fix regression with toolchains lacking ld.bfd executable UPSTREAM: ARM: 8410/1: VDSO: fix coarse clock monotonicity regression

Pavel Labath (1): BACKPORT: arm64: hw_breakpoint: Handle inexact watchpoint addresses

Peter Hurley (1): BACKPORT: n_tty: Fix unordered accesses to lockless read buffer

Peter Zijlstra (4): perf: Tighten (and fix) the grouping condition BACKPORT: perf: Fix event->ctx locking BACKPORT: time: Rename timekeeper::tkr to timekeeper::tkr_mono BACKPORT: time: Add timerkeeper::tkr_raw

Prasanna Karthik (1): UPSTREAM: ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check

Pratyush Anand (3): BACKPORT: hw_breakpoint: Allow watchpoint of length 3,5,6 and 7 UPSTREAM: arm64: Allow hw watchpoint at varied offset from base address UPSTREAM: arm64: Allow hw watchpoint of length 3,5,6 and 7

Rob Herring (2): config: android: move device mapper options to recommended config: android: set SELinux as default security mode

Rohit kumar (1): UPSTREAM staging: ion: Fix error handling in ion_buffer_create

Russell King (1): BACKPORT: ARM: re-implement physical address space switching

Sami Tolvanen (1): ANDROID: android-recommended.cfg: CONFIG_CPU_SW_DOMAIN_PAN=y

Seung-Woo Kim (1): UPSTREAM: regulator: core: Fix regualtor_ena_gpio_free not to access pin after freeing

Subash Abhinov Kasiviswanathan (1): misc: uidstat: change release handler for stat read operation

Takashi Iwai (1): ALSA: pcm : Call kill_fasync() in stream lock

Tyler Baker (1): UPSTREAM: mm: fix type cast in __pfn_to_phys()

Wei Wang (1): uid_sys_stats: change to use rt_mutex

yangdongdong (1): power: align wakeup_sources format

Documentation/networking/ip-sysctl.txt | 13 ++- Makefile | 8 +- android/configs/android-base.cfg | 19 +++-- android/configs/android-recommended.cfg | 6 +- arch/arm/Makefile | 8 ++ arch/arm/crypto/.gitignore | 2 + arch/arm/include/asm/Kbuild | 1 - arch/arm/include/asm/auxvec.h | 1 + arch/arm/include/asm/elf.h | 9 ++ arch/arm/include/asm/memory.h | 6 -- arch/arm/include/asm/mmu.h | 3 + arch/arm/include/asm/vdso.h | 32 +++++++ arch/arm/include/asm/vdso_datapage.h | 60 +++++++++++++ arch/arm/include/uapi/asm/Kbuild | 1 + arch/arm/include/uapi/asm/auxvec.h | 7 ++ arch/arm/kernel/Makefile | 1 + arch/arm/kernel/asm-offsets.c | 5 ++ arch/arm/kernel/head.S | 3 + arch/arm/kernel/process.c | 17 +++- arch/arm/kernel/vdso.c | 337 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mm/Kconfig | 18 ++++ arch/arm/mm/Makefile | 1 + arch/arm/mm/mmu.c | 124 +++++++++------------------ arch/arm/mm/pv-fixup-asm.S | 88 +++++++++++++++++++ arch/arm/vdso/.gitignore | 3 + arch/arm/vdso/Makefile | 78 +++++++++++++++++ arch/arm/vdso/datapage.S | 15 ++++ arch/arm/vdso/vdso.S | 35 ++++++++ arch/arm/vdso/vdso.lds.S | 87 +++++++++++++++++++ arch/arm/vdso/vdsomunge.c | 201 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/vdso/vgettimeofday.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm64/Makefile | 10 +++ arch/arm64/include/asm/hw_breakpoint.h | 6 +- arch/arm64/include/asm/memory.h | 6 -- arch/arm64/include/asm/vdso_datapage.h | 8 +- arch/arm64/kernel/Makefile | 4 - arch/arm64/kernel/asm-offsets.c | 6 +- arch/arm64/kernel/hw_breakpoint.c | 153 ++++++++++++++++++++++++--------- arch/arm64/kernel/ptrace.c | 7 +- arch/arm64/kernel/vdso.c | 20 +++-- arch/arm64/kernel/vdso/Makefile | 10 ++- arch/arm64/kernel/vdso/gettimeofday.S | 331 +++++++++++++++++++++++++++++++++++++++++++--------------------------- arch/ia64/Makefile | 4 +- arch/s390/kernel/time.c | 18 ++-- arch/tile/kernel/time.c | 24 +++--- arch/unicore32/include/asm/memory.h | 6 -- arch/x86/kernel/vsyscall_gtod.c | 24 +++--- arch/x86/kvm/x86.c | 14 +-- arch/x86/vdso/Makefile | 4 +- drivers/base/power/main.c | 43 ---------- drivers/base/power/wakeup.c | 4 +- drivers/char/Kconfig | 4 - drivers/char/Makefile | 1 - drivers/char/dcc_tty.c | 326 --------------------------------------------------------------------- drivers/cpufreq/cpufreq_interactive.c | 8 +- drivers/input/evdev.c | 2 +- drivers/md/dm-android-verity.c | 53 ++++++++---- drivers/misc/Kconfig | 5 +- drivers/misc/Makefile | 2 +- drivers/misc/uid_cputime.c | 254 ------------------------------------------------------ drivers/misc/uid_stat.c | 2 +- drivers/misc/uid_sys_stats.c | 477 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/core/mmc.c | 16 ++++ drivers/regulator/core.c | 2 + drivers/staging/android/Kconfig | 2 +- drivers/staging/android/binder.c | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ drivers/staging/android/ion/ion.c | 15 ++-- drivers/staging/android/uapi/binder.h | 2 + drivers/tty/n_tty.c | 58 ++++++------- drivers/usb/gadget/function/f_accessory.c | 22 +++-- fs/ext4/inline.c | 12 ++- fs/ext4/inode.c | 49 +++++++++-- fs/ext4/readpage.c | 6 ++ fs/f2fs/data.c | 33 +++++-- fs/f2fs/inline.c | 13 ++- fs/mpage.c | 6 ++ fs/sdcardfs/dentry.c | 41 +++------ fs/sdcardfs/derived_perm.c | 338 +++++++++++++++++++++++++++++++++++------------------------------------- fs/sdcardfs/file.c | 98 +++++++++++++++++---- fs/sdcardfs/inode.c | 110 ++++++++++-------------- fs/sdcardfs/lookup.c | 167 ++++++++++++++++++++++++------------ fs/sdcardfs/main.c | 82 +++++++++--------- fs/sdcardfs/mmap.c | 55 ++++++++---- fs/sdcardfs/multiuser.h | 23 ++--- fs/sdcardfs/packagelist.c | 89 +++++++++++-------- fs/sdcardfs/sdcardfs.h | 139 ++++++++++++++++-------------- fs/sdcardfs/super.c | 39 +++++---- fs/squashfs/Kconfig | 28 ------ fs/squashfs/Makefile | 3 +- fs/squashfs/block.c | 545 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------- fs/squashfs/cache.c | 73 +++++++--------- fs/squashfs/decompressor.c | 55 ++++++------ fs/squashfs/file.c | 140 ++++++++++++++++++++++-------- fs/squashfs/file_cache.c | 38 --------- fs/squashfs/file_direct.c | 243 ++++++++++++++++++++++++---------------------------- fs/squashfs/lz4_wrapper.c | 32 ++----- fs/squashfs/lzo_wrapper.c | 40 ++------- fs/squashfs/page_actor.c | 175 ++++++++++++++++++++++++------------- fs/squashfs/page_actor.h | 82 +++++++----------- fs/squashfs/squashfs.h | 11 ++- fs/squashfs/squashfs_fs_sb.h | 2 +- fs/squashfs/super.c | 7 ++ fs/squashfs/xz_wrapper.c | 19 ++++- fs/squashfs/zlib_wrapper.c | 18 +++- fs/sync.c | 1 + include/asm-generic/memory_model.h | 8 ++ include/linux/ipv6.h | 2 + include/linux/kernel.h | 4 - include/linux/mmc/card.h | 3 + include/linux/mmc/mmc.h | 3 + include/linux/perf_event.h | 6 -- include/linux/pfn.h | 1 + include/linux/sched.h | 8 ++ include/linux/task_io_accounting.h | 2 + include/linux/task_io_accounting_ops.h | 1 + include/linux/timekeeper_internal.h | 16 ++-- include/net/addrconf.h | 3 +- include/net/if_inet6.h | 1 + include/net/tcp.h | 2 - include/trace/events/android_fs.h | 44 ++++++++-- include/trace/events/android_fs_template.h | 37 +++----- include/uapi/linux/hw_breakpoint.h | 4 + include/uapi/linux/ipv6.h | 14 +++ include/uapi/linux/sockios.h | 1 - include/uapi/linux/sysctl.h | 1 + kernel/events/core.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++--------- kernel/panic.c | 8 -- kernel/sched/fair.c | 2 +- kernel/sched/sched.h | 2 +- kernel/time/timekeeping.c | 180 +++++++++++++++++++------------------- net/core/sysctl_net_core.c | 1 + net/ipv4/af_inet.c | 1 - net/ipv4/devinet.c | 8 +- net/ipv4/ping.c | 4 + net/ipv4/tcp.c | 127 --------------------------- net/ipv6/addrconf.c | 61 +++++++++++-- net/ipv6/af_inet6.c | 17 ---- net/ipv6/ndisc.c | 2 + net/netfilter/nf_conntrack_core.c | 16 ++-- net/netfilter/xt_qtaguid.c | 24 +++--- sound/core/pcm_lib.c | 2 +- 141 files changed, 4779 insertions(+), 2734 deletions(-) mode change 100644 => 100755 arch/arm/Makefile create mode 100644 arch/arm/include/asm/auxvec.h create mode 100644 arch/arm/include/asm/vdso.h create mode 100644 arch/arm/include/asm/vdso_datapage.h create mode 100644 arch/arm/include/uapi/asm/auxvec.h create mode 100644 arch/arm/kernel/vdso.c create mode 100644 arch/arm/mm/pv-fixup-asm.S create mode 100644 arch/arm/vdso/.gitignore create mode 100644 arch/arm/vdso/Makefile create mode 100644 arch/arm/vdso/datapage.S create mode 100644 arch/arm/vdso/vdso.S create mode 100644 arch/arm/vdso/vdso.lds.S create mode 100644 arch/arm/vdso/vdsomunge.c create mode 100644 arch/arm/vdso/vgettimeofday.c delete mode 100644 drivers/char/dcc_tty.c delete mode 100644 drivers/misc/uid_cputime.c create mode 100644 drivers/misc/uid_sys_stats.c delete mode 100644 fs/squashfs/file_cache.c