Amit Pundir amit.pundir@linaro.org writes:
- linaro-kernel@lists.linaro.org
---------- Forwarded message ---------- From: Amit Pundir amit.pundir@linaro.org Date: 10 September 2015 at 23:16 Subject: [Git Pull] [LSK-3.18] Pull request for linaro-android-3.18 topic branch To: Kevin Hilman khilman@linaro.org, Alex Shi alex.shi@linaro.org
Hi Kevin, Alex,
"linaro-android-3.18-lsk" topic branch has been updated to latest aosp/android-3.18 and handful of Linaro patches (mostly cleanup). Please consider this pull request for "linux-linaro-lsk-v3.18-android" branch.
"git request-pull .." format did not work out as expected this time, I'm still not sure why, may be because you pulled from aosp directly last time.(?)
Maybe, I like to pull in AOSP directly so I see conflicts.
What you can do to generate a clean pull request is to checkout a temporary branch based on current lsk-v3.18-android branch, merge your branch into that, and then generate the pull request.
Also, thanks for the detailed conflict resolution summary in your merge of AOSP. Very helpful.
Kevin