linux-kernel - linux-next: manual merge of the amdgpu tree with Linus' 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: <20210108120413.4eabad36@canb.auug.org.au>
Date:   Fri, 8 Jan 2021 12:04:13 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Deucher <alexdeucher@...il.com>
Cc:     Alex Deucher <alexander.deucher@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Maxime Ripard <maxime@...no.tech>,
        Tian Tao <tiantao6@...ilicon.com>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree

Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

between commit:

  eca22edb37d2 ("drm: Pass the full state to connectors atomic functions")

from Linus' tree and commit:

  540b60f9fc7f ("drm/amd/display: remove unused including <linux/version.h>")

from the amdgpu 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/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 8ab0b9060d2b,5340c41b85f0..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@@ -23,8 -23,6 +23,7 @@@
   *
   */
  
- #include <linux/version.h>
 +#include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_dp_mst_helper.h>
  #include <drm/drm_dp_helper.h>

Content of type "application/pgp-signature" skipped