Hi Alex,

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

KernelCI link is down for linaro-android trees and didn't do much of local build testing either. Shamelessly relying on KernelCI build bot results for linux-linaro-lsk-v3.18-android tree for any breakage.

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

Regards, Amit Pundir

The following changes since commit a9cc70977784f91accde7515f58a90f5b47a1d30:

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

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 61c92ff9f7a1d58744371be531ba398a43301bd0:

UPSTREAM: arm: perf: Fix callchain parse error with kernel tracepoint events (2017-05-25 18:19:34 +0530)

---------------------------------------------------------------- Amit Pundir (3): Revert "ARM: 8457/1: psci-smp is built only for SMP" ANDROID: Skip building uid_sys_stats and keyreset drivers as modules ANDROID: dm verity: Export dm_disk

Andrey Konovalov (2): BACKPORT: UPSTREAM: dccp: fix freeing skb too early for IPV6_RECVPKTINFO UPSTREAM: net/packet: fix overflow in check for priv area size

Arnd Bergmann (9): ANDROID: memory_state_time: fix undefined behavior with missing DT properties ANDROID: dm: android-verity: hide __setup functions in loadable module ANDROID: rfkill: fix unused function warning trace: fix trace_graph_ret_raw return type PM / Suspend: use time_to_tm for printing timestamps Revert "cpu: add generic support for CPU feature based module autoloading" usb: gadget: f_accessory: remove unused acc_bind_config function usb: gadget: mtp: fix endianess bug usb: gadget: u_ether: fix debug format string

Behan Webster (1): UPSTREAM: ARM: 8170/1: Add global named register current_stack_pointer for ARM

Chenbo Feng (4): ANDROID: Add untag hacks to inet_release function Revert "BACKPORT: [UPSTREAM] ext4: convert to mbcache2" Revert "BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache" Revert "BACKPORT: [UPSTREAM] ext2: convert to mbcache2"

Dan Ehrenberg (1): UPSTREAM: init: export name_to_dev_t and mark name argument as const

Daniel Roseberg (1): ANDROID: sdcardfs: Don't iput if we didn't igrab

Daniel Rosenberg (14): ANDROID: sdcardfs: update module info ANDROID: sdcardfs: Directly pass lower file for mmap Android: sdcardfs: Change cache GID value ANDROID: sdcardfs: ->iget fixes Android: sdcardfs: Don't do d_add for lower fs Android: sdcardfs: Don't complain in fixup_lower_ownership Revert "Android: sdcardfs: Don't do d_add for lower fs" ANDROID: sdcardfs: Use filesystem specific hash Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs"" ANDROID: sdcardfs: Copy meta-data from lower inode ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges ANDROID: sdcardfs: Call lower fs's revalidate ANDROID: sdcardfs: Move top to its own struct ANDROID: sdcardfs: Check for NULL in revalidate

Davidlohr Bueso (1): UPSTREAM: sched: Export sched_setscheduler_nocheck

Dmitry Shmidt (2): Revert "cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions" ANDROID: sdcardfs: Add linux/kref.h include

Eliad Peller (6): UPSTREAM: wlcore: add device-tree support UPSTREAM: wlcore: remove wl12xx_platform_data UPSTREAM: wl18xx: fallback to default conf in case of invalid conf file BACKPORT: wl18xx: add radar detection implementation UPSTREAM: wlcore: add p2p device support BACKPORT: ARM: dts: add wl12xx/wl18xx bindings

Eric Dumazet (2): BACKPORT [UPSTREAM] net: add real socket cookies UPSTREAM: ipv4: keep skb->dst around in presence of IP options

Eryu Guan (1): BACKPORT: ext4: validate s_first_meta_bg at mount time

Ganesh Mahendran (1): ANDROID: uid_sys_stats: fix access of task_uid(task)

Gao Xiang (1): ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach

Geert Uytterhoeven (1): UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K

Guenter Roeck (1): ANDROID: power: Provide dummy log_suspend_abort_reason() if SUSPEND is disabled

Hou Pengyang (2): UPSTREAM: arm64: perf: Fix callchain parse error with kernel tracepoint events UPSTREAM: arm: perf: Fix callchain parse error with kernel tracepoint events

Jack Pham (1): ANDROID: usb: gadget: f_mtp: Change the icon to camera for PTP composition

Jan Kara (3): BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache BACKPORT: [UPSTREAM] ext4: convert to mbcache2 BACKPORT: [UPSTREAM] ext2: convert to mbcache2

Jin Qian (3): ANDROID: uid_sys_stats: reduce update_io_stats overhead BACKPORT: f2fs: sanity check log_blocks_per_seg uid_sys_stats: defer io stats calulation for dead tasks

Lianwei Wang (1): UPSTREAM: PM / sleep: make PM notifiers called symmetrically

Lorenzo Colitti (2): UPSTREAM: net: ipv4: Don't crash if passing a null sk to ip_do_redirect. ANDROID: make PF_KEY SHA256 use RFC-compliant truncation.

Luciano Coelho (2): UPSTREAM: wlcore: set irq_trigger in board files instead of hiding behind a quirk BACKPORT: wl12xx: use frequency instead of enumerations for pdata clocks

Max Bires (1): UPSTREAM: char: lack of bool string made CONFIG_DEVPORT always on

Nicolas Pitre (1): ARM: 8285/1: remove ARMv3 user access code again

Raphaël Poggi (1): UPSTREAM: wlcore: sdio: return correct error code

Russell King (1): UPSTREAM: ARM: keystone2: move update of the phys-to-virt constants into generic code

Sascha Hauer (1): UPSTREAM: mmc: Add SDIO function devicetree subnode parsing

Stephen Smalley (1): BACKPORT: UPSTREAM: selinux: fix off-by-one in setprocattr

Steve Muckle (4): ANDROID: android-base.cfg: remove defunct options ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG ANDROID: android-base.cfg: remove spurious CONFIG_MODULES line

Theodore Ts'o (1): UPSTREAM: ext4: fix fencepost in s_first_meta_bg validation

Tim Murray (1): lowmemorykiller: account for unevictable pages

Tobias Klauser (1): UPSTREAM: net: socket: Make unnecessarily global sockfs_setattr() static

Todd Poynor (1): Revert "BACKPORT [UPSTREAM] net: add real socket cookies"

Wei Wang (1): BACKPORT: checkpatch: special audit for revert commit line

Zhou Chengming (1): BACKPORT: UPSTREAM: sysctl: Drop reference added by grab_header in proc_sys_readdir

zhangshuxiao (1): staging: android: ashmem: lseek failed due to no FMODE_LSEEK.

android/configs/android-base.cfg | 5 - arch/arm/boot/dts/am335x-evmsk.dts | 11 +++ arch/arm/boot/dts/omap3-cm-t3517.dts | 10 ++ arch/arm/boot/dts/omap3-cm-t3730.dts | 10 ++ arch/arm/boot/dts/omap3-evm-common.dtsi | 10 ++ arch/arm/boot/dts/omap3-zoom3.dts | 10 ++ arch/arm/boot/dts/omap4-panda-common.dtsi | 10 ++ arch/arm/boot/dts/omap4-sdp.dts | 11 +++ arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 10 ++ arch/arm/include/asm/mach/arch.h | 2 +- arch/arm/include/asm/perf_event.h | 7 ++ arch/arm/include/asm/psci.h | 2 +- arch/arm/include/asm/thread_info.h | 5 + arch/arm/lib/Makefile | 15 +-- arch/arm/lib/uaccess.S | 564 ---------------------------------------------------------------------------------------------------------------- arch/arm/mach-davinci/Kconfig | 11 --- arch/arm/mach-davinci/board-da850-evm.c | 112 ----------------------- arch/arm/mach-keystone/keystone.c | 27 ++---- arch/arm/mach-omap2/pdata-quirks.c | 77 ---------------- arch/arm/mm/mmu.c | 24 ++++- arch/arm64/include/asm/perf_event.h | 7 ++ drivers/base/Kconfig | 5 - drivers/base/cpu.c | 10 +- drivers/char/Kconfig | 6 +- drivers/md/dm-android-verity.c | 2 + drivers/md/dm.c | 2 +- drivers/misc/Kconfig | 2 +- drivers/misc/memory_state_time.c | 78 +++++++++------- drivers/misc/uid_sys_stats.c | 123 ++++++++++++++----------- drivers/mmc/core/bus.c | 4 + drivers/mmc/core/core.c | 28 ++++++ drivers/mmc/core/core.h | 3 + drivers/mmc/core/sdio_bus.c | 11 +++ drivers/net/wireless/ti/wilink_platform_data.c | 25 ----- drivers/net/wireless/ti/wl12xx/main.c | 63 +++++++++++-- drivers/net/wireless/ti/wl12xx/scan.c | 6 +- drivers/net/wireless/ti/wl12xx/wl12xx.h | 28 ++++++ drivers/net/wireless/ti/wl18xx/cmd.c | 31 +++++++ drivers/net/wireless/ti/wl18xx/cmd.h | 11 +++ drivers/net/wireless/ti/wl18xx/event.c | 21 +++++ drivers/net/wireless/ti/wl18xx/event.h | 14 ++- drivers/net/wireless/ti/wl18xx/main.c | 97 +++++++++++++++----- drivers/net/wireless/ti/wl18xx/scan.c | 6 +- drivers/net/wireless/ti/wl18xx/wl18xx.h | 4 +- drivers/net/wireless/ti/wlcore/boot.c | 1 - drivers/net/wireless/ti/wlcore/cmd.c | 29 +++--- drivers/net/wireless/ti/wlcore/cmd.h | 6 ++ drivers/net/wireless/ti/wlcore/debugfs.c | 2 +- drivers/net/wireless/ti/wlcore/hw_ops.h | 9 ++ drivers/net/wireless/ti/wlcore/init.c | 2 +- drivers/net/wireless/ti/wlcore/init.h | 1 + drivers/net/wireless/ti/wlcore/main.c | 259 ++++++++++++++++++++++++++++++++++++++++++++------- drivers/net/wireless/ti/wlcore/sdio.c | 64 +++++++++++-- drivers/net/wireless/ti/wlcore/spi.c | 6 +- drivers/net/wireless/ti/wlcore/wlcore.h | 7 +- drivers/net/wireless/ti/wlcore/wlcore_i.h | 13 ++- drivers/staging/android/ashmem.c | 1 + drivers/staging/android/lowmemorykiller.c | 1 + drivers/usb/gadget/function/f_accessory.c | 60 ++---------- drivers/usb/gadget/function/f_mtp.c | 15 ++- drivers/usb/gadget/function/u_ether.c | 2 +- fs/ext4/super.c | 9 ++ fs/f2fs/super.c | 8 ++ fs/proc/proc_sysctl.c | 3 +- fs/sdcardfs/dentry.c | 25 +++++ fs/sdcardfs/derived_perm.c | 132 +++++++++++++------------- fs/sdcardfs/file.c | 15 ++- fs/sdcardfs/inode.c | 62 ++++++------- fs/sdcardfs/lookup.c | 41 +++++---- fs/sdcardfs/main.c | 21 +++-- fs/sdcardfs/mmap.c | 57 +++++------- fs/sdcardfs/multiuser.h | 13 ++- fs/sdcardfs/packagelist.c | 2 +- fs/sdcardfs/sdcardfs.h | 106 +++++++++++++-------- fs/sdcardfs/super.c | 58 ++++++++++-- include/linux/mount.h | 2 +- include/linux/netfilter/xt_qtaguid.h | 1 + include/linux/wakeup_reason.h | 7 +- include/linux/wl12xx.h | 49 ---------- init/do_mounts.c | 4 +- kernel/cgroup.c | 2 +- kernel/power/hibernate.c | 20 ++-- kernel/power/main.c | 11 ++- kernel/power/power.h | 2 + kernel/power/suspend.c | 16 ++-- kernel/power/user.c | 14 +-- kernel/sched/core.c | 1 + kernel/trace/trace_output.c | 2 +- net/dccp/input.c | 3 +- net/ipv4/af_inet.c | 4 + net/ipv4/ip_sockglue.c | 9 +- net/ipv4/route.c | 3 +- net/netfilter/xt_qtaguid.c | 107 +++++++++++----------- net/netfilter/xt_qtaguid_internal.h | 2 - net/netfilter/xt_qtaguid_print.c | 8 +- net/packet/af_packet.c | 4 +- net/rfkill/core.c | 13 +-- net/socket.c | 2 +- net/xfrm/xfrm_algo.c | 2 +- scripts/checkpatch.pl | 1 + security/selinux/hooks.c | 2 +- 101 files changed, 1401 insertions(+), 1440 deletions(-) delete mode 100644 arch/arm/lib/uaccess.S