Hello dri-devel & dim users,
I committed this patch to the drm-misc-next branch:
commit d6cd978f7e6b6f6895f8d0c4ce6e5d2c8e979afe video: fbdev: fbmem: fix pointer reference to null device field
then I noticed that it was fixed already in another branch which led to this error:
Merging drm-misc/drm-misc-next... dim: dim: FAILURE: Could not merge drm-misc/drm-misc-next dim: See the section "Resolving Conflicts when Rebuilding drm-tip" dim: in the drm-tip.rst documentation for how to handle this situation.
I fixed it by reverting that patch above with this new commit in the drm-misc-next branch:
commit cabfa2bbe617ddf0a0cc4d01f72b584dae4939ad (HEAD -> drm-misc-next, drm-misc/for-linux-next, drm-misc/drm-misc-next) Author: Helge Deller deller@gmx.de Revert "video: fbdev: fbmem: fix pointer reference to null device field"
My question (as "dim" newbie): Was that the right solution? Is there a possibility to drop those two patches from the drm-misc-next branch before it gets pushed upstream?
TIA, Helge