From: Boris Brezillon <boris.brezillon@collabora.com>
To: Mark Brown <broonie@kernel.org>
Cc: Steven Price <steven.price@arm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
Dmitry Osipenko <dmitry.osipenko@collabora.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
Akash Goel <akash.goel@arm.com>, Chia-I Wu <olvaffe@gmail.com>,
Rob Clark <robin.clark@oss.qualcomm.com>,
Dmitry Baryshkov <lumag@kernel.org>,
Abhinav Kumar <abhinav.kumar@linux.dev>,
Jessica Zhang <jesszhan0024@gmail.com>,
Sean Paul <sean@poorly.run>,
Marijn Suijten <marijn.suijten@somainline.org>,
linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Rob Clark <rob.clark@oss.qualcomm.com>
Subject: Re: [PATCH v4] drm/gem: Make the GEM LRU lock part of drm_device
Date: Tue, 19 May 2026 13:51:53 +0200 [thread overview]
Message-ID: <20260519135153.42c3f4a0@fedora> (raw)
In-Reply-To: <a1920a93-ac61-4246-a57c-b10bada3d70c@sirena.org.uk>
On Tue, 19 May 2026 12:37:16 +0100
Mark Brown <broonie@kernel.org> wrote:
> On Mon, May 18, 2026 at 04:52:25PM +0200, Boris Brezillon wrote:
> > +Mark for the silent conflict resolution needed to reconcile
> > drm-misc-fixes and drm-next/drm-misc-next.
>
> This doesn't appear to be a drm-misc thing, I was seeing issues on the
> DRM tree. The patch does seem to ahve resolved things though. Please
> consider topic branches!
I'm just following the dim guide for resolution of conflicts between
drm trees[1], so that's probably something to discuss with the
DRM/DRM-misc maintainers. As for the suggestion to use topic branches,
I've never heard of it being used for -fixes vs -next conflict
resolution, every time I've gone through this process it was for
xxx-next vs yyy-next conflict (xxx and yyy being different subsystem
trees).
Maxime, Thomas, Maarteen, Sima and/or Dave, any suggestion/opinion?
[1]https://drm.pages.freedesktop.org/maintainer-tools/committer/conflict-resolution.html
next prev parent reply other threads:[~2026-05-19 11:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-18 11:41 Boris Brezillon
2026-05-18 14:52 ` Boris Brezillon
2026-05-18 14:54 ` Boris Brezillon
2026-05-19 11:37 ` Mark Brown
2026-05-19 11:51 ` Boris Brezillon [this message]
2026-05-21 9:07 ` Simona Vetter
2026-05-21 10:10 ` 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=20260519135153.42c3f4a0@fedora \
--to=boris.brezillon@collabora.com \
--cc=abhinav.kumar@linux.dev \
--cc=airlied@gmail.com \
--cc=akash.goel@arm.com \
--cc=broonie@kernel.org \
--cc=dmitry.osipenko@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jesszhan0024@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=lumag@kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marijn.suijten@somainline.org \
--cc=mripard@kernel.org \
--cc=olvaffe@gmail.com \
--cc=rob.clark@oss.qualcomm.com \
--cc=robin.clark@oss.qualcomm.com \
--cc=sean@poorly.run \
--cc=simona@ffwll.ch \
--cc=steven.price@arm.com \
--cc=tzimmermann@suse.de \
/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
Powered by JetHome