linux-kernel - linux-next: manual merge of the drm-misc 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>] [day] [month] [year] [list]

Message-ID: <20241003110431.4bbfd467@canb.auug.org.au>
Date: Thu, 3 Oct 2024 11:04:31 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Simona Vetter <simona.vetter@...ll.ch>
Cc: Adrián Larumbe <adrian.larumbe@...labora.com>, Boris
 Brezillon <boris.brezillon@...labora.com>, Intel Graphics
 <intel-gfx@...ts.freedesktop.org>, DRI <dri-devel@...ts.freedesktop.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Liviu Dudau
 <liviu.dudau@....com>
Subject: linux-next: manual merge of the drm-misc tree with the
 drm-misc-fixes tree

Hi all,

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

  drivers/gpu/drm/panthor/panthor_drv.c

between commit:

  2b55639a4e25 ("drm/panthor: Add FOP_UNSIGNED_OFFSET to fop_flags")

from the drm-misc-fixes tree and commit:

  e16635d88fa0 ("drm/panthor: add DRM fdinfo support")

from the drm-misc tree.

I fixed it up (see below) 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

diff --cc drivers/gpu/drm/panthor/panthor_drv.c
index c520f156e2d7,f9b93f84d611..000000000000
--- a/drivers/gpu/drm/panthor/panthor_drv.c
+++ b/drivers/gpu/drm/panthor/panthor_drv.c
@@@ -1383,7 -1476,7 +1476,8 @@@ static const struct file_operations pan
  	.read = drm_read,
  	.llseek = noop_llseek,
  	.mmap = panthor_mmap,
 +	.fop_flags = FOP_UNSIGNED_OFFSET,
+ 	.show_fdinfo = drm_show_fdinfo,
  };
  
  #ifdef CONFIG_DEBUG_FS

Content of type "application/pgp-signature" skipped