linux-kernel - linux-next: manual merge of the drm tree with the drm-misc-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250718144140.202fcca5@canb.auug.org.au>
Date: Fri, 18 Jul 2025 14:41:40 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dave Airlie <airlied@...hat.com>, Simona Vetter <simona.vetter@...ll.ch>
Cc: Intel Graphics <intel-gfx@...ts.freedesktop.org>, DRI
 <dri-devel@...ts.freedesktop.org>, Dmitry Osipenko
 <dmitry.osipenko@...labora.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Thomas Zimmermann <tzimmermann@...e.de>,
 Vivek Kasireddy <vivek.kasireddy@...el.com>
Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes
 tree

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/virtio/virtgpu_prime.c

between commit:

  0ecfb8ddb953 ("Revert "drm/virtio: Use dma_buf from GEM object instance"")

from the drm-misc-fixes tree and commit:

  44b6535d8ace ("drm/virtio: Fix NULL pointer deref in virtgpu_dma_buf_free_obj()")

from the drm tree.

I fixed it up (I used the latter version - reverting the former by hand)
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

Content of type "application/pgp-signature" skipped