Re: linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2018-03-26T03:46:01Z

[-- Attachment #1: Type: text/plain, Size: 678 bytes --]

Hi all,

On Thu, 22 Mar 2018 17:37:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm tree got conflicts in several amdgpu
> files because there are a set of (mostly identical) patches that appear
> Linus' tree and the drm tree. In each case I just used the version fo
> the file from the drm tree.
>
> You should do a test merge between your tree and Linus' tree and see what
> you want to do about the resolution (either do the back merge (I think
> with v4.16-rc6), or provide Linus with branch that has the merge done).
> Its a bit of a mess :-(

I got a few more of these today.
--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]