From: Mark Brown <broonie@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Mario Limonciello" <superm1@kernel.org>,
"Alex Deucher" <alexdeucher@gmail.com>,
"Alex Huang" <Alex.Huang2@amd.com>,
"Alex Hung" <alex.hung@amd.com>, "Alvin Lee" <Alvin.Lee2@amd.com>,
"Arunpravin Paneer Selvam" <Arunpravin.PaneerSelvam@amd.com>,
"Bhawanpreet Lakha" <bhawanpreet.lakha@amd.com>,
"Dillon Varone" <Dillon.Varone@amd.com>,
"Dr. David Alan Gilbert" <linux@treblig.org>,
"Fangzhi Zuo" <jerry.zuo@amd.com>,
"Feifei Xu" <Feifei.Xu@amd.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Ivan Lipski" <ivan.lipski@amd.com>,
"James Lin" <pinglei.lin@amd.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Maarten Lankhorst" <dev@lankhorst.se>,
"Michel Dänzer" <mdaenzer@redhat.com>, "Ray Wu" <ray.wu@amd.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Satyajit Roy" <sroy14@alum.utk.edu>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Timur Kristóf" <timur.kristof@gmail.com>,
"Tomasz Pakuła" <tomasz.pakula.oficjalny@gmail.com>,
"Tom Chung" <chiahsuan.chung@amd.com>,
"Wenjing Liu" <wenjing.liu@amd.com>,
"YiPeng Chai" <YiPeng.Chai@amd.com>
Subject: Re: linux-next: manual merge of the amdgpu tree with the drm-misc,drm-fixes tree
Date: Tue, 15 Sep 2026 00:19:36 +0100 [thread overview]
Message-ID: <aqiBCCgXCnahDcT7@sirena.org.uk> (raw)
In-Reply-To: <20260914230828.GA331288@ax162>
[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]
On Mon, Sep 14, 2026 at 04:08:28PM -0700, Nathan Chancellor wrote:
> f65198b3d0738 removed the use of parse_edid_cea() in
> amdgpu_dm_connector.c but it looks like Mark put these functions back
> into place to keep everything building and working for 0412b1064a3bd
> when the two are merged together.
To be clear my current merge is junk, it's one of those occasional ones
where the constant stream of noisy conflicts caused issues when there
was actually something meaningful and I was fixing up later after rerere
had stored a badly broken resolution. I was hoping the AMD people would
merge up the conflicting branch or give me a fixup so we had a proper
resolution in -next, I haven't had any input from them.
> Given f65198b3d0738, it seems like 0412b1064a3bd is pointless and could
> be reverted entirely to try and avoid this conflict altogether? I tested
> the following diff and it seems to build cleanly for me.
That does look sensible to me, I might try that next time this conflict
recurs.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-09-14 23:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-11 13:25 Mark Brown
2026-09-11 15:09 ` Mark Brown
2026-09-14 23:08 ` Nathan Chancellor
2026-09-14 23:19 ` Mark Brown [this message]
2026-09-15 16:39 ` Mark Brown
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=aqiBCCgXCnahDcT7@sirena.org.uk \
--to=broonie@kernel.org \
--cc=Alex.Huang2@amd.com \
--cc=Alvin.Lee2@amd.com \
--cc=Arunpravin.PaneerSelvam@amd.com \
--cc=Dillon.Varone@amd.com \
--cc=Feifei.Xu@amd.com \
--cc=YiPeng.Chai@amd.com \
--cc=alex.hung@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=bhawanpreet.lakha@amd.com \
--cc=chiahsuan.chung@amd.com \
--cc=dev@lankhorst.se \
--cc=harry.wentland@amd.com \
--cc=ivan.lipski@amd.com \
--cc=jerry.zuo@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@treblig.org \
--cc=mdaenzer@redhat.com \
--cc=nathan@kernel.org \
--cc=pinglei.lin@amd.com \
--cc=ray.wu@amd.com \
--cc=rodrigo.vivi@intel.com \
--cc=sroy14@alum.utk.edu \
--cc=superm1@kernel.org \
--cc=thomas.hellstrom@linux.intel.com \
--cc=timur.kristof@gmail.com \
--cc=tomasz.pakula.oficjalny@gmail.com \
--cc=wenjing.liu@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®