Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin,
In case you are waiting for my pull request for linux-linaro-lsk-v3.1x-android for 15.10, you can pull aosp/android-3.1x directly. There are no linaro-fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few backported upstream commits, which resulted in few merge conflicts. Here is my test merge commit log for reference https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
There is this trivial merge conflict I ran into with android-3.14 as well https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/3d1a4...
There seem to be several conflicts with the android-3.10 as well with the latest LTS.
Could you go ahead and prepare branches for me to pull since you've already resolved and documented the conflicts?
Thanks,
Kevin