Hi Kevin, Alex,

Please consider following linaro-android topic pull request for "linux-linaro-lsk-v3.10-android" branch. Boot tested on arm (Qemu) and arm64 (Juno).

Regards, Amit Pundir

The following changes since commit 81f8d49e4f2f38480d83ff53b5c426d8d12910e9:

Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into linaro-android-3.10-lsk (2015-03-15 13:09:33 +0530)

are available in the git repository at:

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

for you to fetch changes up to 146f542aac2cc725aa32f51b354eba5ece7ae08b:

tcp: Silence warning: ‘in6’ may be used uninitialized (2015-04-16 18:16:53 +0530)

---------------------------------------------------------------- Amit Pundir (3): proc: uid_cputime: create uids from kuids Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common cpuidle: governor: menu: fix unused function warning

Greg Hackmann (1): net: ping: fix constness inconsistency in ipv6_chk_addr

Jeff Vander Stoep (2): security: lsm_audit: add ioctl specific auditing SELinux: per-command whitelisting of ioctls

John Stultz (3): staging: Remove the Android logger driver staging: Remove the Android alarm-dev driver staging: Remove logger and alarm-dev from android Makefile

Jon Medhurst (2): cgroup: Fix build warnings when CGROUP not defined tcp: Silence warning: ‘in6’ may be used uninitialized

Mark Salyzyn (2): android: base-cfg: disable ALARM_DEV USB: gadget: android: Integrate f_midi USB MIDI gadget driver part deux

Mike Lockwood (3): USB: gadget: midi: Fix deadlock unbinding driver while it is in use USB: gadget: f_audio_source: Rename symbols to avoid conflicts with f_midi USB: gadget: android: Integrate f_midi USB MIDI gadget driver

Nicolas Dichtel (6): selinux/nlmsg: add XFRM_MSG_NEWSPDINFO selinux/nlmsg: add XFRM_MSG_GETSPDINFO selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFO selinux/nlmsg: add XFRM_MSG_REPORT selinux/nlmsg: add XFRM_MSG_MIGRATE selinux/nlmsg: add XFRM_MSG_MAPPING

Paul Moore (1): selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types

Ruchi Kandoi (1): wakeup: Add last wake up source logging for suspend abort reason.

Ryan Harkin (1): drivers/base: cpu: fix CPU_AUTOPROBE

Sami Tolvanen (1): arm: crypto: Add optimized SHA-256/224

jinqian (2): proc: uid: Adds accounting for the cputimes per uid. Power: Report suspend times from last_suspend_time

Documentation/ABI/testing/sysfs-kernel-wakeup_reasons | 16 + android/configs/android-base.cfg | 1 - arch/arm/crypto/Makefile | 8 +- arch/arm/crypto/sha256-armv4.pl | 716 +++++++++++++++++++++++++++ arch/arm/crypto/sha256-core.S_shipped | 2808 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/crypto/sha256_glue.c | 246 ++++++++++ arch/arm/crypto/sha256_glue.h | 23 + arch/arm/crypto/sha256_neon_glue.c | 172 +++++++ crypto/Kconfig | 7 + drivers/base/cpu.c | 2 +- drivers/base/power/wakeup.c | 22 +- drivers/cpuidle/governors/menu.c | 2 +- drivers/misc/Kconfig | 6 + drivers/misc/Makefile | 1 + drivers/misc/uid_cputime.c | 237 +++++++++ drivers/staging/android/Kconfig | 26 - drivers/staging/android/Makefile | 2 - drivers/staging/android/alarm-dev.c | 444 ----------------- drivers/staging/android/android_alarm.h | 41 -- drivers/staging/android/logger.c | 852 -------------------------------- drivers/staging/android/logger.h | 89 ---- drivers/staging/android/uapi/android_alarm.h | 62 --- drivers/usb/gadget/android.c | 63 ++- drivers/usb/gadget/f_audio_source.c | 90 ++-- drivers/usb/gadget/f_midi.c | 56 ++- include/linux/cgroup.h | 5 - include/linux/lsm_audit.h | 7 + kernel/power/wakeup_reason.c | 36 ++ net/ipv4/tcp.c | 2 +- security/lsm_audit.c | 15 + security/selinux/avc.c | 428 +++++++++++++++- security/selinux/hooks.c | 40 +- security/selinux/include/avc.h | 5 + security/selinux/include/security.h | 34 +- security/selinux/nlmsgtab.c | 9 + security/selinux/ss/avtab.c | 91 +++- security/selinux/ss/avtab.h | 25 +- security/selinux/ss/conditional.c | 32 +- security/selinux/ss/conditional.h | 6 +- security/selinux/ss/policydb.c | 5 + security/selinux/ss/services.c | 202 +++++++- security/selinux/ss/services.h | 6 + 42 files changed, 5281 insertions(+), 1659 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-wakeup_reasons create mode 100644 arch/arm/crypto/sha256-armv4.pl create mode 100644 arch/arm/crypto/sha256-core.S_shipped create mode 100644 arch/arm/crypto/sha256_glue.c create mode 100644 arch/arm/crypto/sha256_glue.h create mode 100644 arch/arm/crypto/sha256_neon_glue.c create mode 100644 drivers/misc/uid_cputime.c delete mode 100644 drivers/staging/android/alarm-dev.c delete mode 100644 drivers/staging/android/android_alarm.h delete mode 100644 drivers/staging/android/logger.c delete mode 100644 drivers/staging/android/logger.h delete mode 100644 drivers/staging/android/uapi/android_alarm.h