Hi Am 05.01.26 um 03:16 schrieb Stephen Rothwell:
Hi all,Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_gem_shmem_helper.c between commit: 8f05e411aee3 ("drm/gem-shmem: Fix typos in documentation") from Linus' tree and commit: b440baf35591 ("drm/gem: Fix kerneldoc warnings") from the drm tree. I fixed it up (I just used the latter) and can carry the fix as
The latter fix is incorrect. You rather want the headline and size-parameter description from the first commit and other docs from the second commit. Like this:
/** * drm_gem_shmem_init - Initialize an allocated object. * @dev: DRM device * @shmem: shmem GEM object to initialize * @size: Buffer size in bytes * * This function initializes an allocated shmem GEM object. * * Returns: * 0 on success, or a negative error code on failure. */ Best regards Thomas
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.
-- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)
