Messages in this thread |  | | Date | Mon, 16 Jan 2023 11:48:00 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the amdgpu tree with the drm-misc tree |
| |
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commit:
a6276e92a037 ("drm: Include <linux/backlight.h> where needed")
from the drm-misc tree and commit:
a98cdd8c4856 ("drm/amd/display: refactor ddc logic from dc_link_ddc to link_ddc")
from the amdgpu 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.
-- Cheers, Stephen Rothwell
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 55a845eb0c6d,7bf21bb52a7d..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@@ -66,8 -66,6 +66,7 @@@ #include "ivsrcid/ivsrcid_vislands30.h" - #include "i2caux_interface.h" +#include <linux/backlight.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h> [unhandled content-type:application/pgp-signature] |  |