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

Message-ID: <20170321141031.GG30407@ulmo.ba.sec>
Date:   Tue, 21 Mar 2017 15:10:31 +0100
From:   Thierry Reding <thierry.reding@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Dave Airlie <airlied@...ux.ie>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Shawn Guo <shawn.guo@...aro.org>
Subject: Re: linux-next: manual merge of the drm-tegra tree with the drm tree

On Tue, Mar 21, 2017 at 11:45:45AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the drm-tegra tree got a conflict in:
> 
>   drivers/gpu/drm/tegra/drm.c
> 
> between commit:
> 
>   10437d9b475e ("drm: tegra: use vblank hooks in struct drm_crtc_funcs")
> 
> from the drm tree and commit:
> 
>   3f2ea8cee24f ("drm/tegra: Don't leak kernel pointer to userspace")
> 
> from the drm-tegra 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.

Stephen,

your resolution looks good to me.

Dave,

the conflict is fairly trivial to resolve, but if you prefer I can
rebase the Tegra tree onto your -next to avoid it.

Thierry

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)