On 10 September 2013 10:05, Alex Shi <alex.shi@linaro.org> wrote:

On 09/10/2013 04:39 PM, Jon Medhurst (Tixy) wrote:

>> and commit 8bd26e3a7e49af2697449bbc, includes this change on Linus' tree
>> too.
>> I saw Greg also picked up the commit.
>
> That is the ARM part of the whole cpuinit feature removal, so if that's
> being backported to the 3.10 stable kernel then none of my patch is
> needed and we can just ignore it and get on with other things :-)

Greg doesn't backport this commit to 3.10 now, but I saw it is included
in 3.11 stable branch.
What our policy for such issues, Mark?

In this case the ideal thing would be to cherry-pick it back and then submit it to Greg, picking it up once Greg has applied it - I strongly suspect that the reason he didn't pull it back was that it didn't apply cleanly due to other changes. However just applying Tixy's change and noting that it corresponds to the upstream commit is OK for resolving this issue. We can also do both, things should merge down cleanly.