From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@redhat•com>
Cc: 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>
Subject: linux-next: manual merge of the drm tree with the drm-fixes tree
Date: Mon, 13 Feb 2023 11:23:09 +1100 [thread overview]
Message-ID: <20230213112309.7a349346@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commits:
877f26bf3ca6 ("drm/amd/display: disable S/G display on DCN 2.1.0")
077e9659581a ("drm/amd/display: disable S/G display on DCN 3.1.2/3")
7ece674cd946 ("Revert "drm/amd/display: disable S/G display on DCN 3.1.4"")
9734a75cd99d ("Revert "drm/amd/display: disable S/G display on DCN 3.1.2/3"")
1b7ac7989ad8 ("Revert "drm/amd/display: disable S/G display on DCN 2.1.0"")
e7d636476ba7 ("Revert "drm/amd/display: disable S/G display on DCN 3.1.5"")
from the drm-fixes tree and commits:
2404f9b0ea01 ("drm/amd/display: disable S/G display on DCN 2.1.0")
f081cd4ca265 ("drm/amd/display: disable S/G display on DCN 3.1.2/3")
69ed0c5d44d7 ("Revert "drm/amd/display: disable S/G display on DCN 3.1.4"")
from the drm tree.
Git's automatic merge ignored commit 1b7ac7989ad8, since on the HEAD
side it was cancelled out by commit 877f26bf3ca6. So I have to manually
reapply commit 1b7ac7989ad8.
This is an issue with duplicate patches that you need to keep in mind.
I fixed it up (I used the former changes) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-13 0:23 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 0:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-29 22:00 linux-next: manual merge of the drm tree with the drm-fixes tree Mark Brown
2026-04-03 13:33 Mark Brown
2026-03-27 20:52 Mark Brown
2026-03-27 20:46 Mark Brown
2026-03-09 14:35 Mark Brown
2026-03-06 13:47 Mark Brown
2026-03-06 13:47 Mark Brown
2026-01-30 15:37 Mark Brown
2026-01-30 15:28 Mark Brown
2026-01-23 17:45 Mark Brown
2025-06-27 2:58 Stephen Rothwell
2024-10-18 1:56 Stephen Rothwell
2024-06-27 15:08 Mark Brown
2024-06-27 15:00 Mark Brown
2024-06-21 13:21 Mark Brown
2023-08-18 1:53 Stephen Rothwell
2022-09-26 17:49 broonie
2022-02-25 16:37 broonie
2022-02-24 16:33 broonie
2021-08-06 12:04 Mark Brown
2021-08-10 11:56 ` Geert Uytterhoeven
2021-08-10 12:53 ` Stephen Rothwell
2020-07-10 2:28 Stephen Rothwell
2019-08-23 3:20 Stephen Rothwell
2019-07-05 2:50 Stephen Rothwell
2019-03-01 2:23 Stephen Rothwell
2019-03-01 23:29 ` Alex Deucher
2019-03-04 0:54 ` Stephen Rothwell
2019-03-11 12:36 ` Daniel Vetter
2018-12-14 1:51 Stephen Rothwell
2018-12-07 2:38 Stephen Rothwell
2018-12-07 2:31 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=20230213112309.7a349346@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=alexander.deucher@amd$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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