Hi all, Today's linux-next merge of the modules tree got a conflict in:
drivers/gpu/drm/clients/drm_fbdev_helper.c
between commit:
6ccc5b5fc1d36 ("drm/fbdev: Move fbdev helpers into client library")
from the drm tree and commit:
df2908090cda3 ("Linux 7.3-rc2")
from the modules tree. I think. It looks like git got confused by the
backmerge of v7.3-rc2 and the file move somehow, I can't actually see
any relevant commits in the modules tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc drivers/gpu/drm/clients/drm_fbdev_helper.c
index af8f15c947f03,36009bb02c257..0000000000000
--- a/drivers/gpu/drm/clients/drm_fbdev_helper.c
+++ b/drivers/gpu/drm/clients/drm_fbdev_helper.c
@@@ -31,10 -31,11 +31,11 @@@
#include <linux/console.h>
#include <linux/export.h>
+ #include <linux/stringify.h>
+#include <drm/clients/drm_fbdev_helper.h>
#include <drm/drm_atomic.h>
#include <drm/drm_drv.h>
-#include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_framebuffer.h>
#include <drm/drm_gem_framebuffer_helper.h>
signature.asc
Description: PGP signature
