From: "Danilo Krummrich" <dakr@kernel.org>
To: "Mark Brown" <broonie@kernel.org>
Cc: "Greg KH" <greg@kroah.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Bartosz Golaszewski" <bartosz.golaszewski@oss.qualcomm.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Matt Roper" <matthew.d.roper@intel.com>,
"Michal Wajdeczko" <michal.wajdeczko@intel.com>,
"Raag Jadav" <raag.jadav@intel.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the drm-xe tree
Date: Mon, 27 Jul 2026 00:33:24 +0200 [thread overview]
Message-ID: <DK8UZDXP0J4J.1ZGL24V7GBCO7@kernel.org> (raw)
In-Reply-To: <amaCqZUpvgKLe9gC@sirena.org.uk>
On Sun Jul 26, 2026 at 11:56 PM CEST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/gpu/drm/xe/xe_i2c.c
>
> between commits:
>
> 5d8ed6b64220a ("drm/xe/i2c: Allow per domain unique id")
> 9420abf8dbc2e ("drm/xe/i2c: Drop manual VF check")
>
> from the drm-xe tree and commits:
>
> e766abbc5191b ("drm/xe/i2c: use platform_device_set_fwnode()")
> 0f485f88656af ("drm/xe/i2c: use device_create_managed_software_node()")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
LGTM, thanks!
prev parent reply other threads:[~2026-07-26 22:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-26 21:56 Mark Brown
2026-07-26 22:33 ` Danilo Krummrich [this message]
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=DK8UZDXP0J4J.1ZGL24V7GBCO7@kernel.org \
--to=dakr@kernel.org \
--cc=bartosz.golaszewski@oss.qualcomm.com \
--cc=broonie@kernel.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthew.d.roper@intel.com \
--cc=michal.wajdeczko@intel.com \
--cc=raag.jadav@intel.com \
--cc=rafael@kernel.org \
--cc=thomas.hellstrom@linux.intel.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®