Please discard this pull request. Sent a new one today.

Regards, Amit Pundir

On 27 March 2017 at 19:07, Amit Pundir amit.pundir@linaro.org wrote:

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 couple of lsk-v3.18-android 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 95f869795a6c84786242bc4d37ef7ffb9c21c8fb:

Revert "net: sysctl_net_core: Fix warning: 'one' defined but not used" (2017-03-27 18:13:08 +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 (2): ANDROID: binder: fix format specifier for type binder_size_t Revert "net: sysctl_net_core: Fix warning: 'one' defined but not used"

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

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

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

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

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

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

Daniel Rosenberg (26): 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

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

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

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

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

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

Martijn Coenen (3): 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.

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.

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 (2): perf: Tighten (and fix) the grouping condition BACKPORT: perf: Fix event->ctx locking

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

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

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

yangdongdong (1): power: align wakeup_sources format

android/configs/android-recommended.cfg | 1 + arch/arm/crypto/.gitignore | 2 + arch/arm/mm/Kconfig | 4 + arch/arm/mm/Makefile | 1 + arch/arm/mm/mmu.c | 124 +++++++++------------------ arch/arm/mm/pv-fixup-asm.S | 88 +++++++++++++++++++ arch/arm64/include/asm/hw_breakpoint.h | 6 +- arch/arm64/kernel/hw_breakpoint.c | 153 ++++++++++++++++++++++++--------- arch/arm64/kernel/ptrace.c | 7 +- drivers/base/power/main.c | 43 ---------- drivers/base/power/wakeup.c | 4 +- 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/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 | 17 ++-- fs/sdcardfs/inode.c | 110 ++++++++++-------------- fs/sdcardfs/lookup.c | 112 +++++++++++++++--------- 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/linux/mmc/card.h | 3 + include/linux/mmc/mmc.h | 3 + include/linux/perf_event.h | 6 -- include/linux/sched.h | 8 ++ include/linux/task_io_accounting.h | 2 + include/linux/task_io_accounting_ops.h | 1 + include/trace/events/android_fs.h | 44 ++++++++-- include/trace/events/android_fs_template.h | 37 +++----- include/uapi/linux/hw_breakpoint.h | 4 + kernel/events/core.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++--------- kernel/sched/fair.c | 2 +- kernel/sched/sched.h | 2 +- net/core/sysctl_net_core.c | 1 + net/ipv4/ping.c | 4 + net/netfilter/nf_conntrack_core.c | 16 ++-- net/netfilter/xt_qtaguid.c | 24 +++--- sound/core/pcm_lib.c | 2 +- 78 files changed, 2965 insertions(+), 1882 deletions(-) create mode 100644 arch/arm/mm/pv-fixup-asm.S 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