| Message ID | 20230127132804.636960bb@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree | expand |
diff --cc drivers/gpu/drm/drm_fbdev_generic.c index bd1f8f28297c,43f94aa9e015..000000000000 --- a/drivers/gpu/drm/drm_fbdev_generic.c
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_fbdev_generic.c between commits: cc88ad784e42 ("drm/fb-helper: Check fb_deferred_io_init() return value") d6591da5f3ff ("drm/fb-helper: Use a per-driver FB deferred I/O handler") from the drm-misc-fixes tree and commit: 6ca80b9e5cc0 ("drm/fbdev-generic: Rename struct fb_info 'fbi' to 'info'") from the drm-misc 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.