On 22/02/2018 15:45, Quentin Perret wrote:
On Thursday 22 Feb 2018 at 14:42:49 (+0000), Quentin Perret wrote:
On Thursday 22 Feb 2018 at 15:34:56 (+0100), Vincent Guittot wrote:
On 22 February 2018 at 15:27, Daniel Lezcano daniel.lezcano@linaro.org wrote:
Hi,
I tried to update my branches but I'm facing a conflict issue [1]
I also tried with a clean tree and the conflict is still there.
Vincent had the same conflict.
The conflict also happens if we try to merge android-4.9-eas-dev with android-4.9
8a174b4749d3 sched/fair: prevent possible infinite loop in sched_group_energy is a critical bug fix so it got merged in android-4.9 directly. It's not in android-4.9-eas-dev so I'm not surprised there are merge conflicts in this case. However, I'm not sure why that would prevent you from merging android-4.9 into the hikey kernel ... I'll look into that.
Oh actually the hikey 4.9 branch has the fix already so that's the same issue. We'll fix those conflicts when we'll merge android-4.9-eas-dev in android-4.9 ...
You should fix the conflict before in order to unblock people who is tracking the android-eas-dev branch.
Can't you cherry-pick 8a174b4749d3 in android-4.9-eas-dev, solve the conflict and push ?
-- http://www.linaro.org/ Linaro.org │ Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro Facebook | http://twitter.com/#!/linaroorg Twitter | http://www.linaro.org/linaro-blog/ Blog