Hi all,
On Fri, 5 Nov 2021 12:51:22 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Thu, 28 Oct 2021 18:27:53 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> >
> > between commit:
> >
> > 5740211ea442 ("drm/i915/dmabuf: fix broken build")
> >
> > from the drm-intel tree and commit:
> >
> > 16b0314aa746 ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace")
> >
> > from the char-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.
> >
> > diff --cc drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> > index a45d0ec2c5b6,abb854281347..000000000000
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> > @@@ -12,13 -13,8 +13,15 @@@
> > #include "i915_gem_object.h"
> > #include "i915_scatterlist.h"
> >
> > +#if defined(CONFIG_X86)
> > +#include <asm/smp.h>
> > +#else
> > +#define wbinvd_on_all_cpus() \
> > + pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__)
> > +#endif
> > +
> > + MODULE_IMPORT_NS(DMA_BUF);
> > +
> > I915_SELFTEST_DECLARE(static bool force_different_devices;)
> >
> > static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf)
>
> This is now a conflict between the drm-intel tree and Linux' tree.
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpIoIrN8DHaZ.pgp
Description: OpenPGP digital signature
