Messages in this thread | | | Date | Mon, 17 Jun 2019 13:25:04 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree |
| |
Hi all,
On Wed, 12 Jun 2019 11:46:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/display/dc/dce/dce_audio.c > > between commit: > > c7c7192c56d2 ("drm/amd/display: add audio related regs") > > from the amdgpu tree and commit: > > 4fc4dca8320e ("drm/amd: drop use of drmp.h in os_types.h") > > from the drm-misc 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/dc/dce/dce_audio.c > index d43d5d924c19,9b078a71de2e..000000000000 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c > @@@ -22,7 -22,9 +22,10 @@@ > * Authors: AMD > * > */ > + > + #include <linux/slab.h> > + > +#include "../dc.h" > #include "reg_helper.h" > #include "dce_audio.h" > #include "dce/dce_11_0_d.h"
This is now a conflict between the drm tree and the amdgpu tree.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |