From: Cristian Ciocaltea <cristian.ciocaltea@collabora•com>
To: Luca Ceresoli <luca.ceresoli@bootlin•com>,
Mark Brown <broonie@kernel•org>, Dave Airlie <airlied@redhat•com>,
DRI <dri-devel@lists•freedesktop.org>
Cc: Christian Hewitt <christianshewitt@gmail•com>,
Daniel Stone <daniels@collabora•com>,
Jonas Karlman <jonas@kwiboo•se>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree
Date: Wed, 18 Mar 2026 20:20:53 +0200 [thread overview]
Message-ID: <d13e23a3-af02-475f-ae54-3ce90968447f@collabora.com> (raw)
In-Reply-To: <DH60ZGTHFMZ5.HOOT9GVR0Q0V@bootlin.com>
Hi Luca,
On 3/18/26 5:49 PM, Luca Ceresoli wrote:
> Hello Mark, all,
>
> On Wed Mar 18, 2026 at 3:36 PM CET, Mark Brown wrote:
>> Hi all,
>>
>> Today's linux-next merge of the drm tree got a conflict in:
>>
>> drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
>>
>> between commit:
>>
>> cffcb42c57686 ("drm/bridge: dw-hdmi-qp: fix multi-channel audio output")
>>
>> from the drm-misc-fixes tree and commit:
>>
>> 3ea699b56d31c ("drm/bridge: dw-hdmi-qp: Rework Audio InfoFrame handler")
>>
>> from the drm 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.
>
> The conflict originated as I applied cffcb42c57686 on drm-misc-fixes. I
> carefully followed the dim procedure as I know it, so I'm not sure I did
> anything wrong, but if I did I apologize.
>
> The steps I did are:
>
> - dim update-branches
> - dim checkout drm-misc-fixes
> - dim b4-shazam URL
> - dim checkpatch+sparse ...
> - dim push-branch drm-misc-fixes
>
> One thing with this procedure is that dim push-branch pushes first, then
> finds out any conflicts. I wonder whether dim could be changed to find any
> conflicts before pushing.
>
> As soon as dim push-branch warned me about the conflict I tried solving it
> myself as per [0], but the patches on drm-misc-next (3ea699b56d31c) changed
> the codebase completely and was unable to sort it out fully.
>
> I at least fixed the conflict at a pure patch application level, so I would
> expect the rerere cache would avoid future conflicts. I was wrong
> apparently. It had worked in the past, no idea what went wrong this time.
>
> Then, as far as the original bug is concerned, I notified the involved
> patch authors [1] hoping they could find out whether there is the same bug
> in the drm-misc-next code and fix it if needed.
I've already confirmed that commit 3ea699b56d31c in drm-misc-next does also
handle the audio bug, therefore no additional fix is required.
Regards,
Cristian
next prev parent reply other threads:[~2026-03-18 18:20 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-18 14:36 linux-next: manual merge of the drm tree with the drm-misc-fixes tree Mark Brown
2026-03-18 15:49 ` Luca Ceresoli
2026-03-18 18:20 ` Cristian Ciocaltea [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-20 14:17 Mark Brown
2026-03-20 15:39 ` Boris Brezillon
2026-04-08 17:26 ` Mark Brown
2026-04-09 7:47 ` Boris Brezillon
2026-01-05 2:21 Stephen Rothwell
2025-08-20 1:21 Stephen Rothwell
2025-08-20 10:30 ` Danilo Krummrich
2025-08-20 21:29 ` Stephen Rothwell
2025-07-18 4:41 Stephen Rothwell
2025-07-18 6:27 ` Thomas Zimmermann
2025-01-14 1:30 Stephen Rothwell
2023-11-22 0:29 Stephen Rothwell
2023-11-28 10:04 ` Geert Uytterhoeven
2023-09-28 2:05 Stephen Rothwell
2023-06-27 1:54 Stephen Rothwell
2023-07-11 1:17 ` Stephen Rothwell
2022-11-21 2:06 Stephen Rothwell
2022-07-11 2:47 Stephen Rothwell
2022-07-11 8:05 ` Christian König
2022-07-17 23:44 ` Stephen Rothwell
2022-07-19 7:35 ` Geert Uytterhoeven
2022-07-27 2:55 ` Stephen Rothwell
2022-07-27 3:24 ` Dave Airlie
2022-07-27 5:37 ` Stephen Rothwell
2022-03-18 0:55 Stephen Rothwell
2022-03-18 1:06 ` Stephen Rothwell
2021-12-22 3:50 Stephen Rothwell
2021-12-22 7:31 ` Christian König
2021-11-29 23:33 Stephen Rothwell
2021-11-30 8:58 ` Maxime Ripard
2021-11-30 20:35 ` Stephen Rothwell
2021-10-22 0:53 Stephen Rothwell
2021-06-17 1:42 Stephen Rothwell
2021-04-09 3:12 Stephen Rothwell
2021-03-18 1:02 Stephen Rothwell
2021-03-18 6:51 ` Tomi Valkeinen
2020-07-28 3:41 Stephen Rothwell
2020-05-01 3:45 Stephen Rothwell
2020-03-01 23:43 Stephen Rothwell
2019-09-15 21:18 Mark Brown
2019-09-16 5:29 ` Vasily Khoruzhick
2019-09-17 2:43 ` Qiang Yu
2019-08-26 3:06 Stephen Rothwell
2019-08-29 10:11 ` james qian wang (Arm Technology China)
2018-11-26 2:37 Stephen Rothwell
2018-03-08 0:47 Stephen Rothwell
2017-12-13 23:59 Stephen Rothwell
2017-01-17 0:59 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=d13e23a3-af02-475f-ae54-3ce90968447f@collabora.com \
--to=cristian.ciocaltea@collabora$(echo .)com \
--cc=airlied@redhat$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=christianshewitt@gmail$(echo .)com \
--cc=daniels@collabora$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=jonas@kwiboo$(echo .)se \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luca.ceresoli@bootlin$(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