Hi Kevin, Alex,
Please consider following linaro-android pull request for "linux-linaro-lsk-v3.14-android" branch.
A quick note on a particular LMG commit: 17b3b28baf84 (fix: align closely to AOSP), which cleans up our Android topic branch and align it closely to aosp/android-3.14 branch. LMG carry forwarded quiet a few (200+) aosp/android-3.10 patches to linaro-android-3.14-lsk tree when aosp/android-3.14 was not announced. This was done to support Android on a member platform with 3.14-lsk. Over time we saw that there are few gaps in our forward-ported branch from 3.10->3.14, and how AOSP is maintaining the patches, eg. they dropped few obsolete/broken patches which we didn't. Hence we came up with this particular cleanup patch. FWIW this pull requests apply cleanly to lsk-v3.14-android.
Regards, Amit Pundir
The following changes since commit bf3015849c3e9e7befda3f877e7646756b5925ee:
nf: IDLETIMER: Fix broken uid field in the msg (2015-05-11 14:54:29 +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 17b3b28baf84999421d56dce68c4b1c1ec7f1ef3:
fix: align closely to AOSP. (2015-06-08 11:13:17 +0530)
---------------------------------------------------------------- Amit Pundir (3): nf: IDLETIMER: Fix broken uid field in the msg Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common sched: cpufreq: update power usage only if cpufreq_stat is enabled
Jin Qian (1): proc: uid_cputime: fix show_uid_stat permission
Junjie Wu (1): cpufreq: interactive: Implement cluster-based min_sample_time
Mark Salyzyn (2): net/unix: sk_socket can disappear when state is unlocked New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
Rohit Gupta (1): cpufreq: interactive: Rearm governor timer at max freq
Ruchi Kandoi (4): suspend: Return error when pending wakeup source is found. cpufreq_stats: Adds the fucntionality to load current values for each frequency for all the cores. sched: cpufreq: Adds a field cpu_power in the task_struct uid_cputime: Extends the cputime functionality to report power per uid
Saravana Kannan (1): cpufreq: interactive: Exercise hispeed settings at a policy level
Stephen Smalley (2): selinux: enable per-file labeling for debugfs files. selinux: enable genfscon labeling for sysfs and pstore files
Sumit Semwal (1): fix: align closely to AOSP.
Theodore Ts'o (1): ext4: don't save the error information if the block device is read-only
arch/arm/Kconfig | 7 +++- arch/arm/mm/mmu.c | 23 ------------- arch/arm64/Kconfig | 21 ------------ arch/arm64/include/asm/debug-monitors.h | 7 ---- arch/mips/include/uapi/asm/unistd.h | 6 ++-- drivers/cpufreq/cpufreq_interactive.c | 132 ++++++++++++++++++++++++---------------------------------------------- drivers/cpufreq/cpufreq_stats.c | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- drivers/misc/uid_cputime.c | 14 ++++++-- drivers/mmc/core/core.c | 23 +++++++------ drivers/mmc/core/host.c | 3 -- drivers/usb/gadget/f_accessory.c | 3 +- drivers/usb/gadget/u_ether.c | 22 ++++++------ fs/ext4/super.c | 2 ++ include/linux/cpufreq.h | 8 +++++ include/linux/mmc/host.h | 2 -- include/linux/sched.h | 1 + include/net/bluetooth/hci.h | 3 -- include/net/bluetooth/hci_core.h | 2 +- include/net/netfilter/ipv4/nf_reject.h | 8 ----- include/net/netfilter/ipv6/nf_reject.h | 9 ----- include/uapi/asm-generic/unistd.h | 5 +-- kernel/fork.c | 1 + kernel/irq/pm.c | 1 - kernel/power/suspend.c | 3 +- kernel/power/wakelock.c | 7 ++++ kernel/sched/cputime.c | 11 ++++++ kernel/sys.c | 20 ----------- net/bluetooth/hci_conn.c | 18 ---------- net/bluetooth/hci_event.c | 1 - net/bluetooth/rfcomm/core.c | 1 + net/caif/caif_socket.c | 8 +++++ net/ipv4/netfilter/Kconfig | 12 ------- net/ipv6/netfilter/Kconfig | 12 ------- net/unix/af_unix.c | 8 +++++ net/wireless/Kconfig | 11 ------ net/wireless/sme.c | 7 ---- security/selinux/hooks.c | 45 ++++++++++++------------ security/selinux/include/security.h | 1 + 38 files changed, 345 insertions(+), 347 deletions(-)