Hi Alex,
On 13 March 2015 at 13:02, Alex Shi alex.shi@linaro.org wrote:
Hi Mark, Sumit and Amit,
Please review the merge conflict resolving patch. BTW, do we need to pick up 5aa9ef6f286 on stable kernel?
So, it looks like in AOSP, this is how it is:
2015-02-05 Mark Rutland arm64: Fix up /proc/cpuinfo ( => the above corresponds to the cherry-picked 42b34c73ae40 that you mention.)
2015-02-05 Mark Rutland arm64: cpuinfo: record cpu system register values ( => 5aa9ef6f286 that you're talking about)
In other words, what we think is "newer commit 5aa9ef6f286", actually has 'older' commit 42b34c73ae40 cherry-picked on top of it.
I suspect if you look at the the upstream/android-3.14 [1] branch, direct pulled from AOSP, the right sequence of changes should be clear.
Chase, Vishal,
I pushed the branch to linux-linaro-lsk-v3.14-android-test 6 hours ago. But didn't find the CI or testing image result, where are them?
Thanks
commit 438628396ca8a44f6b710a73612939bc54633d7c Merge: 5afe132 0d590a1 Author: Alex Shi alex.shi@linaro.org Date: Fri Mar 13 09:15:58 2015 +0800
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android Remove cpuinfo_arm64/cpuinfo_store_cpu() that comes from commit 42b34c73ae40(used for stable kernel only), since we have newer commit 5aa9ef6f286. Conflicts: arch/arm64/include/asm/cputype.h arch/arm64/kernel/setup.c
Strangely, in your merge commit, I don't see arch/arm64/kernel/setup.c as an updated file - perhaps there's some mistake in what changes got picked during conflict-resolution?
<snip>
-- Thanks Alex
Best regards, ~Sumit.
[1]: https://android.git.linaro.org/gitweb/kernel/linaro-android.git/shortlog/ref...