Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin,
Please consider following linaro-android pull request for "linux-linaro-lsk-v3.18-android" branch. There are no linaro fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few patches backported from upstream, which resulted in few merge conflicts. Here is the link[1] to merge commit log for reference.
Thanks for the detailed description of the conflict resolutions in the merge commit. Much appreciated!
Regards, Amit Pundir [1] https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
The following changes since commit 717ba9113b87cae180d7c9f2078e76359bc9bcca:
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android (2015-09-27 22:10:16 -0700)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git linux-linaro-lsk-v3.18-android
Hmm, a branch with that name doesn't exist. But one with a "test/" prefix exists...
for you to fetch changes up to c2fab09b2ec32f252029757ba3353ea3d308c811:
...and seems to match that commit, so I'll assume that's the one you meant, so...
Pulled into linux-linaro-lsk-v3.18-android.
Thanks,
Kevin