]> Gentwo Git Trees - linux/.git/commit
drm/xe: Fix duplicated put due to merge resolution
authorThomas Hellström <thomas.hellstrom@linux.intel.com>
Thu, 4 Dec 2025 20:20:59 +0000 (21:20 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Dec 2025 22:13:04 +0000 (14:13 -0800)
commitaa833fc394baad601b8f7779c1ae2ada3a06ce07
treed4fca364201171b1565b7240ea936f588aa8b996
parentdd463c51a327d341d3ece63dd50e1a0f8f09c468
drm/xe: Fix duplicated put due to merge resolution

An incorrect backmerge resolution resulted in an
incorrect duplicate put. Fix.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Closes: https://lore.kernel.org/dri-devel/CAHk-=whaiMayMx=LrL7P119MLBX6exM_mEu4S2uBRT+xWQ-mbA@mail.gmail.com/
Fixes: Fixes: ce0478b02ed2 ("Merge tag 'v6.18-rc6' into drm-next")
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/gpu/drm/xe/xe_exec_queue.c