Amit Pundir amit.pundir@linaro.org writes:
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.
Very nice, and thanks for the heads up and the detailed changelog in that patch. Much appreciated.
FWIW this pull requests apply cleanly to lsk-v3.14-android.
And thank you for describing the conflict resolutions in your merge of AOSP. Also very helpful since I did a pre-merge of AOSP and noticed the same conflicts and your description helped me understand why. Again, much appreciated!
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)
Pulled into linux-linaro-lsk-v3.14-android-test (after a spin through CI, I'll push to the normal branch.)
Kevin