Message ID | 20240906131502.7a7d1962@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | linux-next: manual merge of the drm-xe tree with the drm-intel tree | expand |
On Fri, Sep 06, 2024 at 01:15:02PM GMT, Stephen Rothwell wrote: >Hi all, > >Today's linux-next merge of the drm-xe tree got a conflict in: > > drivers/gpu/drm/xe/display/xe_display.c > >between commit: > > 11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where needed") > >from the drm-intel tree and commit: > > 87d8ecf01544 ("drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h>") > >from the drm-xe tree. > >I fixed it up (see below) and can carry the fix as necessary. This looks good, thanks Lucas De Marchi >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/xe/display/xe_display.c >index 303d00b99a68,75736faf2a80..000000000000 >--- a/drivers/gpu/drm/xe/display/xe_display.c >+++ b/drivers/gpu/drm/xe/display/xe_display.c >@@@ -10,8 -10,7 +10,8 @@@ > > #include <drm/drm_drv.h> > #include <drm/drm_managed.h> > +#include <drm/drm_probe_helper.h> >- #include <drm/xe_drm.h> >+ #include <uapi/drm/xe_drm.h> > > #include "soc/intel_dram.h" > #include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */
Hi all, On Fri, 6 Sep 2024 13:15:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the drm-xe tree got a conflict in: > > drivers/gpu/drm/xe/display/xe_display.c > > between commit: > > 11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where needed") > > from the drm-intel tree and commit: > > 87d8ecf01544 ("drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h>") > > from the drm-xe 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/xe/display/xe_display.c > index 303d00b99a68,75736faf2a80..000000000000 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@@ -10,8 -10,7 +10,8 @@@ > > #include <drm/drm_drv.h> > #include <drm/drm_managed.h> > +#include <drm/drm_probe_helper.h> > - #include <drm/xe_drm.h> > + #include <uapi/drm/xe_drm.h> > > #include "soc/intel_dram.h" > #include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */ This is now a conflict between the drm-intel and drm trees.
On Wed, 11 Sep 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > On Fri, 6 Sep 2024 13:15:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> >> Today's linux-next merge of the drm-xe tree got a conflict in: >> >> drivers/gpu/drm/xe/display/xe_display.c >> >> between commit: >> >> 11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where needed") >> >> from the drm-intel tree and commit: >> >> 87d8ecf01544 ("drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h>") >> >> from the drm-xe 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/xe/display/xe_display.c >> index 303d00b99a68,75736faf2a80..000000000000 >> --- a/drivers/gpu/drm/xe/display/xe_display.c >> +++ b/drivers/gpu/drm/xe/display/xe_display.c >> @@@ -10,8 -10,7 +10,8 @@@ >> >> #include <drm/drm_drv.h> >> #include <drm/drm_managed.h> >> +#include <drm/drm_probe_helper.h> >> - #include <drm/xe_drm.h> >> + #include <uapi/drm/xe_drm.h> >> >> #include "soc/intel_dram.h" >> #include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */ > > This is now a conflict between the drm-intel and drm trees. I backmerged drm-next to drm-intel-next, resolving the conflict. Thanks, Jani.
diff --cc drivers/gpu/drm/xe/display/xe_display.c index 303d00b99a68,75736faf2a80..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display.c