Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin, Alex,
Please consider following linaro-android pull request for "linux-linaro-lsk-v3.18-android" branch. Just a couple of minor Linaro fixes [1][2] on top of aosp/android-3.18 for lsk-v3.18-android.
Regards, Amit Pundir
[1] https://android.git.linaro.org/gitweb/kernel/linaro-android.git/commitdiff/c... [2] https://android-review.googlesource.com/#/c/159240/
The following changes since commit 028d5c1bb15977715f4c5d8c7827deec05a3fb59:
Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common (2015-06-04 13:02:57 +0530)
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 d86b81d4d5f700610182ce19d9ba646303fe16bb:
android: configs: base: enable USB_CONFIGFS (2015-07-13 18:00:57 +0530)
Pulled into the lsk-v3.18-android-test branch for a spin through CI, will then be pushed to the lsk-v3.18-android branch.
Note that the LSK base was updated to v3.18.19 which has also been included in the -android branch.
Amit Pundir (4): sched: cpufreq: update power usage only if cpufreq_stat is enabled Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common arm64: move mixed endian EL0 declarations under __ASSEMBLY__ guards android: configs: base: enable USB_CONFIGFS
Kevin Hilman (1): cpufreq_stats: fix use of cpufreq_for_each_valid_entry() iterator
Yay, the first time one of my commits to AOSP was actually merged!
Kevin
Rom Lemarchand (1): initramfs: Add skip_initramfs command line option
Ruchi Kandoi (5): sched: cpufreq: Adds a field cpu_power in the task_struct uid_cputime: Extends the cputime functionality to report power per uid cpufreq: Iterate over all the possible cpus to create powerstats. uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit. cpu_power: Avoids race condition when the task exits.
Tobias Lindskog (1): Shrink ashmem directly through shmem_fallocate
android/configs/android-base.cfg | 2 +- arch/arm64/include/asm/cpufeature.h | 4 ++-- drivers/cpufreq/cpufreq_stats.c | 32 +++++++++++++++++++++++++++----- drivers/misc/uid_cputime.c | 18 ++++++++++++++++-- drivers/staging/android/ashmem.c | 2 +- include/linux/cpufreq.h | 9 +++++++++ include/linux/initramfs.h | 32 ++++++++++++++++++++++++++++++++ include/linux/sched.h | 1 + init/Makefile | 3 --- init/initramfs.c | 19 ++++++++++++++++++- init/noinitramfs.c | 9 ++++++++- kernel/fork.c | 1 + kernel/sched/cputime.c | 11 +++++++++++ 13 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 include/linux/initramfs.h