linux-kernel - linux-next: manual merge of the drm-msm-lumag tree with the drm-msm 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: <20220906113819.1abecef0@canb.auug.org.au>
Date:   Tue, 6 Sep 2022 11:38:19 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
        Rob Clark <robdclark@...il.com>,
        Sean Paul <seanpaul@...omium.org>
Cc:     Jilin Yuan <yuanjilin@...rlc.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Clark <robdclark@...omium.org>
Subject: linux-next: manual merge of the drm-msm-lumag tree with the drm-msm
 tree

Hi all,

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

  drivers/gpu/drm/msm/msm_gem.h

between commit:

  b352ba54a820 ("drm/msm/gem: Convert to using drm_gem_lru")

from the drm-msm tree and commit:

  aabc003330ed ("drm/msm: fix repeated words in comments")

from the drm-msm-lumag tree.

I fixed it up (the former removed the comment updated by the latter) 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