linux-kernel - Re: linux-next: manual merge of the drm-xe tree with the drm-intel 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <uw7zsh4pcsaxgektzf6ie2bqvn2ukfwtxf7onsw5eq6wysiq7h@vu2jei2cshvl>
Date: Thu, 5 Sep 2024 22:27:11 -0500
From: Lucas De Marchi <lucas.demarchi@...el.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: Thomas Hellström <thomas.hellstrom@...ux.intel.com>,
	Daniel Vetter <daniel.vetter@...ll.ch>, Jani Nikula
	<jani.nikula@...ux.intel.com>, Joonas Lahtinen
	<joonas.lahtinen@...ux.intel.com>, Rodrigo Vivi <rodrigo.vivi@...el.com>,
	Intel Graphics <intel-gfx@...ts.freedesktop.org>, DRI
	<dri-devel@...ts.freedesktop.org>, DRM XE List
	<intel-xe@...ts.freedesktop.org>, Linux Kernel Mailing List
	<linux-kernel@...r.kernel.org>, Linux Next Mailing List
	<linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the drm-xe tree with the drm-intel
 tree

On Fri, Sep 06, 2024 at 01:15:02PM GMT, Stephen Rothwell wrote:
>Hi all,
>
>Today's linux-next merge of the drm-xe tree got a conflict in:
>
>  drivers/gpu/drm/xe/display/xe_display.c
>
>between commit:
>
>  11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where needed")
>
>from the drm-intel tree and commit:
>
>  87d8ecf01544 ("drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h>")
>
>from the drm-xe tree.
>
>I fixed it up (see below) and can carry the fix as necessary. This

looks good, thanks

Lucas De Marchi

>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/xe/display/xe_display.c
>index 303d00b99a68,75736faf2a80..000000000000
>--- a/drivers/gpu/drm/xe/display/xe_display.c
>+++ b/drivers/gpu/drm/xe/display/xe_display.c
>@@@ -10,8 -10,7 +10,8 @@@
>
>  #include <drm/drm_drv.h>
>  #include <drm/drm_managed.h>
> +#include <drm/drm_probe_helper.h>
>- #include <drm/xe_drm.h>
>+ #include <uapi/drm/xe_drm.h>
>
>  #include "soc/intel_dram.h"
>  #include "i915_drv.h"		/* FIXME: HAS_DISPLAY() depends on this */