From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Simona Vetter <simona.vetter@ffwll•ch>
Cc: "Intel Graphics" <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Maíra Canal" <mcanal@igalia•com>
Subject: linux-next: manual merge of the drm-misc tree with the origin tree
Date: Wed, 16 Jul 2025 14:23:22 +1000 [thread overview]
Message-ID: <20250716142322.3a681368@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 895 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/etnaviv/etnaviv_sched.c
between commit:
61ee19dedb8d ("drm/etnaviv: Protect the scheduler's pending list with its lock")
from the origin tree and commits:
0a5dc1b67ef5 ("drm/sched: Rename DRM_GPU_SCHED_STAT_NOMINAL to DRM_GPU_SCHED_STAT_RESET")
8902c2b17a6e ("drm/etnaviv: Use DRM_GPU_SCHED_STAT_NO_HANG to skip the reset")
from the drm-misc tree.
I fixed it up (I used the latter version) 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:[~2025-07-16 4:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 4:23 Stephen Rothwell [this message]
2025-07-21 2:50 ` linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-11-15 23:57 linux-next: manual merge of the drm-misc tree with the origin tree Stephen Rothwell
2022-11-17 17:29 ` Nathan Chancellor
2022-11-17 22:06 ` Stephen Rothwell
2022-11-18 0:01 ` Nathan Chancellor
2022-11-18 9:20 ` Maxime Ripard
2021-11-07 22: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=20250716142322.3a681368@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcanal@igalia$(echo .)com \
--cc=simona.vetter@ffwll$(echo .)ch \
/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