From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Lucas De Marchi" <lucas.demarchi@intel•com>,
"Thomas Hellström" <thomas.hellstrom@linux•intel.com>
Cc: DRM XE List <intel-xe@lists•freedesktop.org>,
Balasubramani Vivekanandan <balasubramani.vivekanandan@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Michal Wajdeczko <michal.wajdeczko@intel•com>,
Radhakrishna Sripada <radhakrishna.sripada@intel•com>
Subject: linux-next: manual merge of the drm-xe tree with the drm-intel tree
Date: Fri, 31 May 2024 13:18:35 +1000 [thread overview]
Message-ID: <20240531131835.62339471@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
Hi all,
Today's linux-next merge of the drm-xe tree got a conflict in:
drivers/gpu/drm/xe/xe_pci.c
between commit:
ca5d5ecbb90d ("drm/xe/bmg: Enable the display support")
from the drm-intel tree and commit:
37ea1aee18e7 ("drm/xe: Drop undesired prefix from the platform name")
from the drm-xe 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/xe/xe_pci.c
index d6859108cc69,e84da0cbb8e9..000000000000
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@@ -341,8 -342,7 +342,8 @@@ static const struct xe_device_desc lnl_
static const struct xe_device_desc bmg_desc __maybe_unused = {
DGFX_FEATURES,
- PLATFORM(XE_BATTLEMAGE),
+ PLATFORM(BATTLEMAGE),
+ .has_display = true,
.require_force_probe = true,
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-05-31 3:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-31 3:18 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-19 23:31 linux-next: manual merge of the drm-xe tree with the drm-intel tree Stephen Rothwell
2025-02-26 1:12 Stephen Rothwell
2025-02-17 0:52 Stephen Rothwell
2024-10-14 3:24 Stephen Rothwell
2024-09-06 3:15 Stephen Rothwell
2024-09-06 3:27 ` Lucas De Marchi
2024-09-11 3:52 ` Stephen Rothwell
2024-09-11 8:43 ` Jani Nikula
2024-08-15 1:37 Stephen Rothwell
2024-08-15 13:51 ` Lucas De Marchi
2024-05-06 2:17 Stephen Rothwell
2024-04-10 1:37 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=20240531131835.62339471@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balasubramani.vivekanandan@intel$(echo .)com \
--cc=intel-xe@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@intel$(echo .)com \
--cc=michal.wajdeczko@intel$(echo .)com \
--cc=radhakrishna.sripada@intel$(echo .)com \
--cc=thomas.hellstrom@linux$(echo .)intel.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