Hi Mark, Alex,

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

This pull request contain patches cherry-picked from android-3.14 branch of https://android.googlesource.com/kernel/common and few linaro-android fixes already submitted to AOSP gerrit for review.

android-3.14 test merge into lsk-v3.14-android branch had quiet a few complicated merge conflicts and it was easier to just cherry-pick the AOSP only changes for this pull request and skip the upstream/backported patches from AOSP which are already pulled by LTS.

Regards, Amit Pundir

The following changes since commit 2f0fc7f6a245e841487908cabe2648fe19e133aa:

Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android (2016-02-10 18:21:50 +0000)

are available in the git repository at:

git://android.git.linaro.org/kernel/linaro-android.git lsk-v3.14-android

for you to fetch changes up to 7eff2ffe05a8b2c6c83a4f511ac6c31c858e3048:

Revert "usb: gadget: composite: Fix corruption when changing configuration" (2016-02-12 20:13:36 +0530)

---------------------------------------------------------------- Amit Pundir (4): Revert "net: wireless: Add CONFIG_WIFI_CONTROL_FUNC option" usb: gadget: rndis: use %z format specifier for size_t Revert "HID: Add input_register callback." Revert "usb: gadget: composite: Fix corruption when changing configuration"

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

Benjamin Valentin (1): Input: xpad - sync device IDs with xboxdrv

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

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

Frank Razenberg (1): Input: xpad - add VID/PID for Razer Sabertooth

Jingoo Han (1): UPSTREAM: rtc: rtc-palmas: make of_device_id array const

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

Mark Salyzyn (3): ANDROID: rtc-palmas: correct for bcd year android: recommended.cfg: enable taskstats android: base-cfg: Add CONFIG_IP_MULTICAST

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

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

Ted Mielczarek (1): Input: xpad - add support for Xbox One controllers

Tommi Rantala (2): Input: xpad - add USB ID for Thrustmaster Ferrari 458 Racing Wheel Input: xpad - add Thrustmaster as Xbox 360 controller vendor

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

Vlastimil Babka (2): UPSTREAM: mm: always steal split buddies in fallback allocations UPSTREAM: mm: more aggressive page stealing for UNMOVABLE allocations

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. BACKPORT: FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.

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 | 23 +--- arch/arm/mm/mmap.c | 6 +- arch/arm64/Kconfig | 21 +++ 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-magicmouse.c | 8 +- drivers/hid/hid-multitouch.c | 10 +- drivers/hid/hid-ntrig.c | 6 +- drivers/input/gameport/gameport.c | 4 +- drivers/input/joystick/xpad.c | 773 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------- drivers/input/misc/ims-pcu.c | 4 +- drivers/input/serio/serio.c | 4 +- drivers/input/serio/serio_raw.c | 4 +- drivers/net/wireless/Kconfig | 5 - drivers/rtc/rtc-palmas.c | 46 ++++++- drivers/usb/gadget/composite.c | 10 +- drivers/usb/gadget/rndis.c | 2 +- fs/proc/fd.c | 14 +- fs/proc/task_mmu.c | 20 ++- include/linux/mm.h | 13 +- include/linux/poison.h | 4 +- include/linux/swap.h | 6 + kernel/seccomp.c | 4 +- kernel/sysctl.c | 33 +++-- mm/mmap.c | 12 ++ mm/page_alloc.c | 72 +++++----- mm/swapfile.c | 42 ++++++ security/selinux/ss/conditional.c | 4 +- 37 files changed, 935 insertions(+), 396 deletions(-)