Re: [PATCH 0/9] drm: remove deprecated functions
From: Daniel Vetter <hidden>
Date: 2018-11-29 14:55:43
Also in:
dri-devel, linux-doc, linux-renesas-soc, lkml
On Thu, Nov 29, 2018 at 3:45 PM Linus Walleij [off-list ref] wrote:
On Mon, Nov 26, 2018 at 3:12 PM Daniel Vetter [off-list ref] wrote:quoted
On Sat, Nov 24, 2018 at 10:17:13PM +0100, Linus Walleij wrote:quoted
quoted
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.
This sounds like you (or dim?) accidentaly amended that commit (which
changes the committer and results in the warning), and a rebase would
indeed have fixed that. If the first patch conflicts this can happen
because dim apply-branch doesn't bail out correctly. Or at least did
in the past, I recently fixed that in
commit ee299e510ae468aab27610bcbc4fdd4de932f74b
Author: Daniel Vetter [off-list ref]
Date: Wed Oct 17 08:53:00 2018 +0200
dim: make apply-patch fail again
I just felt slightly out of control :D
If your dim didn't have the above commit and you had a conflict it's all explained. Otherwise I'm not sure what's been going on ... -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel