On Mon, Oct 5, 2020 at 4:47 PM Paul Cercueil paul@crapouillou.net wrote:
Hi,
Le lun. 5 oct. 2020 à 16:05, Daniel Vetter daniel@ffwll.ch a écrit :
On Mon, Oct 05, 2020 at 11:01:50PM +1100, Stephen Rothwell wrote:
Hi Paul,
On Sun, 04 Oct 2020 22:11:23 +0200 Paul Cercueil paul@crapouillou.net wrote:
Pushed to drm-misc-next with the changelog fix, thanks.
Stephen: Now it should build fine again. Could you remove the BROKEN flag?
Thanks for letting me know, but the fix has not appeared in any drm tree included in linux-next yet ...
If it doesn't show up by the time I will merge the drm tree tomorrow, I will apply this revert patch myself (instead of the patch marking the driver BROKEN).
Yeah it should have been pushed to drm-misc-next-fixes per
https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#w...
Paul, can you pls git cherry-pick -x this over to drm-misc-next-fixes?
I had a few commits on top of it in drm-misc-next, so the revert doesn't apply cleanly in drm-misc-next-fixes... I can revert it there, but then we'd have a different revert commit in drm-misc-next and drm-misc-next-next.
Sorry for the mess. What should I do?
Hm not sure why, but the reply I thought I've typed didn't seem to have gone out.
Cherry pick up, fix up conflict and then fix up the conflict when rebuilding drm-tip. Please tell drm-misc maintainers, they probably want to do a backmerge once the drm-next merge window pull is merged in Linus tree.
If we don't fix this up then the drm-next pull goes nowhere. -Daniel