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.
Not sure from where the problem is coming, any suggestion ?
-- Daniel
[1] https://pastebin.com/uFhz2bwe
-- 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
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
Not sure from where the problem is coming, any suggestion ?
-- Daniel
[1] https://pastebin.com/uFhz2bwe
-- 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
eas-dev mailing list eas-dev@lists.linaro.org https://lists.linaro.org/mailman/listinfo/eas-dev
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.
Thanks for the report ! Quentin
Not sure from where the problem is coming, any suggestion ?
-- Daniel
[1] https://pastebin.com/uFhz2bwe
-- 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
eas-dev mailing list eas-dev@lists.linaro.org https://lists.linaro.org/mailman/listinfo/eas-dev
eas-dev mailing list eas-dev@lists.linaro.org https://lists.linaro.org/mailman/listinfo/eas-dev
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 ...
Thanks for the report ! Quentin
Not sure from where the problem is coming, any suggestion ?
-- Daniel
[1] https://pastebin.com/uFhz2bwe
-- 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
eas-dev mailing list eas-dev@lists.linaro.org https://lists.linaro.org/mailman/listinfo/eas-dev
eas-dev mailing list eas-dev@lists.linaro.org https://lists.linaro.org/mailman/listinfo/eas-dev
eas-dev mailing list eas-dev@lists.linaro.org https://lists.linaro.org/mailman/listinfo/eas-dev
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 ...
Having the fix in the hikey-linaro and android-4.9 is not a problem as they have the same sha1. The issue is coming from the android-4.9 and android-4.9-eas-dev because they diverged. You should prevent that by creating a fix branch you merge in android-4.9 and android-4.9-eas-dev so solving the conflicts before they land on our desktop.
-- 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
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
On Thursday 22 Feb 2018 at 16:28:44 (+0100), Daniel Lezcano wrote:
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.
We usually try to avoid conflicts but getting critical bug fixes in android common has always higher priority. Generally speaking, android-4.9-eas-dev is just a dev branch, and even if there are usually no problems, we can't guarantee the absence of conflicts all the time.
I pushed this CL for review. It should (hopefully) solve your issue: https://android-review.googlesource.com/#/c/kernel/common/+/624553
Please give it a try and let me know how is goes.
Can't you cherry-pick 8a174b4749d3 in android-4.9-eas-dev, solve the conflict and push ?
Unfortunately no. We don't have push-rights right now. And we can't create branches either. Hopefully checking-out the above gerrit change can fix your issue until it gets merged.
I hope that helps !
Thanks, Quentin
Hi Quentin,
On 22 February 2018 at 19:15, Quentin Perret quentin.perret@arm.com wrote:
On Thursday 22 Feb 2018 at 16:28:44 (+0100), Daniel Lezcano wrote:
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.
We usually try to avoid conflicts but getting critical bug fixes in android common has always higher priority. Generally speaking, android-4.9-eas-dev is just a dev branch, and even if there are usually no problems, we can't guarantee the absence of conflicts all the time.
I pushed this CL for review. It should (hopefully) solve your issue: https://android-review.googlesource.com/#/c/kernel/common/+/624553
Please give it a try and let me know how is goes.
I have tested the branch successfully
Can't you cherry-pick 8a174b4749d3 in android-4.9-eas-dev, solve the conflict and push ?
Unfortunately no. We don't have push-rights right now. And we can't create branches either. Hopefully checking-out the above gerrit change can fix your issue until it gets merged.
I hope that helps !
Thanks, Quentin
Hi Vincent,
On Friday 23 Feb 2018 at 09:28:08 (+0100), Vincent Guittot wrote:
Hi Quentin,
On 22 February 2018 at 19:15, Quentin Perret quentin.perret@arm.com wrote:
On Thursday 22 Feb 2018 at 16:28:44 (+0100), Daniel Lezcano wrote:
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.
We usually try to avoid conflicts but getting critical bug fixes in android common has always higher priority. Generally speaking, android-4.9-eas-dev is just a dev branch, and even if there are usually no problems, we can't guarantee the absence of conflicts all the time.
I pushed this CL for review. It should (hopefully) solve your issue: https://android-review.googlesource.com/#/c/kernel/common/+/624553
Please give it a try and let me know how is goes.
I have tested the branch successfully
Cool, thanks for the feedback. I'll give it a spin on wltest over the weekend as well.
Thanks, Quentin
Can't you cherry-pick 8a174b4749d3 in android-4.9-eas-dev, solve the conflict and push ?
Unfortunately no. We don't have push-rights right now. And we can't create branches either. Hopefully checking-out the above gerrit change can fix your issue until it gets merged.
I hope that helps !
Thanks, Quentin
-
Daniel Lezcano -
Quentin Perret -
Vincent Guittot