From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Deucher <alexdeucher@gmail•com>,
Daniel Vetter <daniel.vetter@ffwll•ch>
Cc: Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Alex Deucher <alexander.deucher@amd•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thomas Zimmermann <tzimmermann@suse•de>,
Wenjing Liu <wenjing.liu@amd•com>
Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree
Date: Mon, 16 Jan 2023 11:48:00 +1100 [thread overview]
Message-ID: <20230116114800.1c679494@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
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>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-16 0:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-16 0:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-17 2:46 linux-next: manual merge of the amdgpu tree with the drm-misc tree Stephen Rothwell
2024-08-26 1:10 Stephen Rothwell
2024-08-28 2:11 ` Stephen Rothwell
2023-05-15 1:18 Stephen Rothwell
2022-11-16 0:09 Stephen Rothwell
2022-04-06 0:34 Stephen Rothwell
2022-04-13 0:10 ` Stephen Rothwell
2022-04-29 1:13 ` Stephen Rothwell
2022-04-29 10:38 ` Christian König
2021-12-13 15:08 broonie
2021-06-03 2:48 Stephen Rothwell
2021-06-03 2:55 ` Stephen Rothwell
2021-06-04 2:33 ` Stephen Rothwell
2021-05-21 1:42 Stephen Rothwell
2021-05-21 1:38 Stephen Rothwell
2021-05-21 1:20 Stephen Rothwell
2021-05-21 1:16 Stephen Rothwell
2021-05-12 0:20 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230116114800.1c679494@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexander.deucher@amd$(echo .)com \
--cc=alexdeucher@gmail$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tzimmermann@suse$(echo .)de \
--cc=wenjing.liu@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox