linux-kernel - linux-next: manual merge of the drm-msm tree with the drm 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: <20181210140320.5ba2b2e4@canb.auug.org.au>
Date:   Mon, 10 Dec 2018 14:03:20 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Clark <robdclark@...il.com>, Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mamta Shukla <mamtashukla555@...il.com>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Jordan Crouse <jcrouse@...eaurora.org>
Subject: linux-next: manual merge of the drm-msm tree with the drm tree

Hi all,

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

  drivers/gpu/drm/msm/adreno/a5xx_gpu.c

between commit:

  c97ea6a61b5e ("drm: msm: adreno: Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) +PTR_ERR")

from the drm tree and commits:

  dadb36b7ec42 ("drm/msm: Add a common function to free kernel buffer objects")
  7799a98edd80 ("drm/msm: Add a name field for gem objects")

from the drm-msm tree.

I fixed it up (I just used the latter version) 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