On Mon, Nov 26, 2018 at 3:12 PM Daniel Vetter daniel@ffwll.ch wrote:
On Sat, Nov 24, 2018 at 10:17:13PM +0100, Linus Walleij wrote:
It was especially scary.
But I think I managed to apply the patches and push the branch now.
Except when you're racing with someone else you should only see conflicts with stuff you've just pushed. Or if someone forgot to fix up their mess. What was the conflict?
dim push-branches was complaining that one of the commits was missing the proper committer sign-off, it was the bottom commit under mine (IIRC "drm/atomic-helper: WARN if fake_commit->hw_done is not completed as expected") and dim update-branches seemed to rebase and fix up my patches and then everything was fine.
I just felt slightly out of control :D
Yours, Linus Walleij