Hi Mark, Alex,

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

I run into few conflicts while merging aosp/android-3.18 branch:

Conflicts: * arch/arm/Kconfig Pick changes from AOSP commit 7514b4f5c78b "FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS." and skip changes from linaro-android commit 3daddaa28cbf "arm: enable ARCH_MMAP_RND_BITS only for MMU platforms" which are no longer needed.

* arch/arm64/mm/mmap.c Pick changes from AOSP commit 527d350d5e91 "FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS." over changes from LTS commit c4a7bf89fbff "arm64/mm: Remove hack in mmap randomize layout" which are no longer valid.

* include/net/sock.h LTS and AOSP both cherry-picked/backported upstream commit 1d0ab253872c "net: add sk_fullsock() helper" but AOSP removed TCPF_NEW_SYN_RECV check part from the backport. Lets stick with AOSP changes.

* mm/page_alloc.c Conflict here is due to LTS and AOSP both cherrypicking upstream commit 99592d598eca "mm: when stealing freepages, also take pages created by splitting buddy page" and couple more of AOSP backported commits f34a097caa34 "UPSTREAM: mm: always steal split buddies in fallback allocations" and a4edf85a8b92 "UPSTREAM: mm: more aggressive page stealing for UNMOVABLE allocations". Resolution: Keep all of AOSP changes.

I have also logged this ^^ merge conflict + resolution part in the merge commit.

Regards, Amit Pundir

The following changes since commit 8fa6d2e1fe937af9dbacb5aad8c43dbb67466fa0:

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android (2016-01-14 22:26:03 +0800)

are available in the git repository at:

git://android.git.linaro.org/kernel/linaro-android.git linaro-android-3.18-lsk

for you to fetch changes up to 17aa01a7059b202f893a9e7e859032640318b458:

HID: hidpp: update input_configured callback (2016-02-10 22:26:37 +0530)

---------------------------------------------------------------- Amit Pundir (10): usb: gadget: rndis: use %z format specifier for size_t Revert "HID: Add input_register callback." ion: fix page pool cache policy Revert "net: wireless: Add CONFIG_WIFI_CONTROL_FUNC option" Revert "usb: gadget: composite: Fix corruption when changing configuration" Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common kbuild: Makefile.clean: make Kbuild and Makefile optional usb: gadget: function: fix unused func warning usb: gadget: build audio_source function only if SND is enabled HID: hidpp: update input_configured callback

Aniroop Mathur (1): Input: initialize device counter variables with -1

Dario Scarpa (1): Input: xpad - fix Razer Atrox Arcade Stick button mapping

Dmitry Torokhov (1): UPSTREAM: HID: hid-input: allow input_configured callback return errors

Eric Dumazet (3): net: add sk_fullsock() helper ipv6: inet6_sk() should use sk_fullsock() net: diag: support v4mapped sockets in inet_diag_find_one_icsk()

Erik Kline (1): neigh: Better handling of transition to NUD_PROBE state

Erik Lundgren (1): Input: xpad - add Covert Forces edition of the Xbox One controller

John Stultz (4): Revert "mmc: block: Remove call to mmc_blk_set_blksize" Revert "mmc: mmcblk: Add support for deferred SD bus resume" mmc: Extend wakelock if bus is dead of: Fix build warnings

Kees Cook (1): UPSTREAM: seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO

Lorenzo Colitti (6): net: diag: split inet_diag_dump_one_icsk into two net: diag: Add the ability to destroy a socket. net: diag: Support SOCK_DESTROY for inet sockets. net: diag: Support destroying TCP sockets. net: tcp: deal with listen sockets properly in tcp_abort. selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables

Mark Salyzyn (2): ANDROID: rtc-palmas: correct for bcd year android: recommended.cfg: enable taskstats

Martijn Coenen (1): UPSTREAM: memcg: Only free spare array when readers are done

Minchan Kim (1): BACKPORT: mm: /proc/pid/smaps:: show proportional swap share of the mapping

Ming-ting Yao Wei (1): Input: xpad - add rumble support for Xbox One controller

Oleg Nesterov (1): UPSTREAM: proc: actually make proc_fd_permission() thread-friendly

Pavel Rojtberg (8): Input: xpad - re-send LED command on present event Input: xpad - clarify LED enumeration Input: xpad - use ida() for finding the pad_nr Input: xpad - remove needless bulk out URB used for LED setup Input: xpad - factor out URB submission in xpad_play_effect Input: xpad - x360w: report dpad as buttons and axes Input: xpad - query wireless controller state at init Input: xpad - fix clash of presence handling with LED setting

Pierre-Loup A. Griffais (2): Input: xpad - set the LEDs properly on XBox Wireless controllers Input: xpad - move the input device creation to a new function

Sami Tolvanen (9): ANDROID: dm verity: port upstream changes to 3.18 UPSTREAM: dm verity: clean up duplicate hashing code UPSTREAM: dm verity: separate function for parsing opt args UPSTREAM: dm verity: move dm-verity.c to dm-verity-target.c UPSTREAM: dm verity: factor out structures and functions useful to separate object UPSTREAM: dm verity: factor out verity_for_bv_block() UPSTREAM: dm verity: add support for forward error correction UPSTREAM: dm verity: add ignore_zero_blocks feature ANDROID: android: base-cfg: enable CONFIG_DM_VERITY_FEC

Stephen Smalley (1): UPSTREAM: selinux: fix bug in conditional rules handling

Vasily Kulikov (1): UPSTREAM: include/linux/poison.h: fix LIST_POISON{1,2} offset

Vlastimil Babka (3): UPSTREAM: mm: when stealing freepages, also take pages created by splitting buddy page UPSTREAM: mm: always steal split buddies in fallback allocations UPSTREAM: mm: more aggressive page stealing for UNMOVABLE allocations

Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()

dcashman (6): Revert "arm: mm: support ARCH_MMAP_RND_BITS." Revert "mm: mmap: Add new /proc tunable for mmap_base ASLR." FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.

liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update

Documentation/device-mapper/verity.txt | 40 ++++- Documentation/filesystems/proc.txt | 18 ++- Documentation/sysctl/kernel.txt | 14 -- Documentation/sysctl/vm.txt | 29 ++++ android/configs/android-base.cfg | 1 + android/configs/android-recommended.cfg | 4 + arch/Kconfig | 68 +++++++++ arch/arm/Kconfig | 26 +--- arch/arm/mm/mmap.c | 6 +- arch/arm64/Kconfig | 29 ++++ arch/arm64/mm/mmap.c | 11 +- arch/x86/Kconfig | 16 ++ arch/x86/mm/mmap.c | 12 +- drivers/hid/hid-appleir.c | 4 +- drivers/hid/hid-elo.c | 4 +- drivers/hid/hid-logitech-hidpp.c | 4 +- drivers/hid/hid-magicmouse.c | 8 +- drivers/hid/hid-multitouch.c | 10 +- drivers/hid/hid-ntrig.c | 6 +- drivers/hid/hid-rmi.c | 9 +- drivers/hid/hid-sony.c | 13 +- drivers/input/gameport/gameport.c | 4 +- drivers/input/joystick/xpad.c | 581 ++++++++++++++++++++++++++++++++++++++++----------------------------- drivers/input/misc/ims-pcu.c | 4 +- drivers/input/serio/serio.c | 4 +- drivers/input/serio/serio_raw.c | 4 +- drivers/md/Kconfig | 12 ++ drivers/md/Makefile | 5 + drivers/md/dm-verity-fec.c | 818 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/md/dm-verity-fec.h | 152 +++++++++++++++++++ drivers/md/{dm-verity.c => dm-verity-target.c} | 642 ++++++++++++++++++++++++++++++++++++++++++++++------------------------------- drivers/md/dm-verity.h | 130 ++++++++++++++++ drivers/net/wireless/Kconfig | 5 - drivers/rtc/rtc-palmas.c | 44 +++++- drivers/staging/android/ion/ion_system_heap.c | 2 +- drivers/usb/gadget/Kconfig | 3 +- drivers/usb/gadget/composite.c | 10 +- drivers/usb/gadget/function/f_fs.c | 2 +- drivers/usb/gadget/function/rndis.c | 2 +- fs/proc/fd.c | 14 +- fs/proc/task_mmu.c | 20 ++- include/linux/inet_diag.h | 9 ++ include/linux/ipv6.h | 4 +- include/linux/mm.h | 13 +- include/linux/poison.h | 4 +- include/linux/sock_diag.h | 2 + include/linux/swap.h | 6 + include/net/sock.h | 6 +- include/net/tcp.h | 2 + include/uapi/linux/sock_diag.h | 1 + kernel/seccomp.c | 4 +- kernel/sysctl.c | 33 ++-- mm/memcontrol.c | 11 +- mm/mmap.c | 12 ++ mm/page_alloc.c | 72 +++++---- mm/swapfile.c | 42 +++++ net/core/neighbour.c | 3 + net/core/sock_diag.c | 23 ++- net/ipv4/Kconfig | 13 ++ net/ipv4/inet_diag.c | 83 ++++++---- net/ipv4/tcp.c | 37 +++++ net/ipv4/tcp_diag.c | 19 +++ net/ipv4/tcp_ipv4.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/netfilter/xt_qtaguid.c | 7 +- scripts/Makefile.clean | 2 +- security/keys/process_keys.c | 1 + security/selinux/nlmsgtab.c | 7 +- security/selinux/ss/conditional.c | 4 +- 69 files changed, 2506 insertions(+), 706 deletions(-) create mode 100644 drivers/md/dm-verity-fec.c create mode 100644 drivers/md/dm-verity-fec.h rename drivers/md/{dm-verity.c => dm-verity-target.c} (66%) create mode 100644 drivers/md/dm-verity.h