pulled.
Thanks Alex
On 04/17/2015 04:04 AM, Amit Pundir wrote:
Hi Kevin, Alex,
Please consider following linaro-android topic pull request for "linux-linaro-lsk-v3.14-android" branch.
Regards, Amit Pundir
The following changes since commit 3aa99367190965aa8881a187e484bec34e3a794f:
Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common into linaro-android-3.14-lsk (2015-03-15 15:01:55 +0530)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git linaro-android-3.14-lsk
for you to fetch changes up to 401b999aa32ba52f4f074bafc3220fc25fb99ef2:
android: misc: fix unused function and variable warnings (2015-04-17 00:17:29 +0530)
Amit Pundir (5): net: ipv6: fix build failure if IPV6_ROUTE_INFO config is enabled cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach proc: uid_cputime: create uids from kuids Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common android: misc: fix unused function and variable warnings
Jeff Vander Stoep (2): security: lsm_audit: add ioctl specific auditing SELinux: per-command whitelisting of ioctls
John Stultz (4): staging: Remove the Android logger driver staging: Remove the Android alarm-dev driver staging: Remove logger and alarm-dev from android Makefile arm: dcc_tty: fix armv6 dcc tty build failure
Junjie Wu (1): cpufreq: interactive: Put global cpufreq kobject on failure
Mark Salyzyn (1): android: base-cfg: disable ALARM_DEV
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
Ruchi Kandoi (1): wakeup: Add last wake up source logging for suspend abort reason.
Ryan Harkin (1): drivers/base: cpu: fix CPU_AUTOPROBE
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 - drivers/base/cpu.c | 2 +- drivers/base/power/wakeup.c | 22 ++- drivers/cpufreq/cpufreq_interactive.c | 4 +- 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 | 445
drivers/staging/android/android_alarm.h | 41 ------ drivers/staging/android/logger.c | 851
drivers/staging/android/logger.h | 89 ----------- drivers/staging/android/uapi/android_alarm.h | 62 -------- drivers/usb/gadget/android.c | 10 +- drivers/usb/gadget/f_fs.c | 2 +- drivers/usb/gadget/f_mtp.c | 4 +- include/linux/lsm_audit.h | 7 + kernel/irq/pm.c | 2 +- kernel/power/wakeup_reason.c | 36 +++++ 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 | 7 + 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 + 35 files changed, 1168 insertions(+), 1596 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-wakeup_reasons 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