From: Danilo Krummrich <dakr@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Dave Airlie <airlied@redhat.com>,
DRI <dri-devel@lists.freedesktop.org>,
Alice Ryhl <aliceryhl@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Vitaly Wool <vitaly.wool@konsulko.se>
Subject: Re: linux-next: manual merge of the drm tree with the origin tree
Date: Thu, 2 Oct 2025 14:30:13 +0200 [thread overview]
Message-ID: <e2eeec46-cc0e-46e8-8069-085fbd06afe3@kernel.org> (raw)
In-Reply-To: <aN5qmhC9tUOCNjed@sirena.org.uk>
On 10/2/25 2:05 PM, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
(I think this was a conflict between the DRM tree and the MM tree already before.)
The resolution looks good to me, thanks!
- Danilo
next prev parent reply other threads:[~2025-10-02 12:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-02 12:05 linux-next: manual merge of the drm tree with the origin tree Mark Brown
2025-10-02 12:30 ` Danilo Krummrich [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-02 12:07 Mark Brown
2025-09-26 12:38 Mark Brown
2024-06-28 16:51 Mark Brown
2024-06-27 15:06 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=e2eeec46-cc0e-46e8-8069-085fbd06afe3@kernel.org \
--to=dakr@kernel.org \
--cc=airlied@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=aliceryhl@google.com \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=vitaly.wool@konsulko.se \
/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;
as well as URLs for NNTP newsgroup(s).