* linux-next: manual merge of the char-misc tree with the drm-intel tree
@ 2021-10-28 7:27 Stephen Rothwell
2021-10-29 7:45 ` Greg KH
2021-11-05 1:51 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2021-10-28 7:27 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Daniel Vetter, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI
Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Matthew Auld
[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the char-misc tree with the drm-intel tree
2021-10-28 7:27 linux-next: manual merge of the char-misc tree with the drm-intel tree Stephen Rothwell
@ 2021-10-29 7:45 ` Greg KH
2021-11-05 1:51 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-10-29 7:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Matthew Auld
On Thu, Oct 28, 2021 at 06:27:53PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> 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)
Fix looks good, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the char-misc tree with the drm-intel tree
2021-10-28 7:27 linux-next: manual merge of the char-misc tree with the drm-intel tree Stephen Rothwell
2021-10-29 7:45 ` Greg KH
@ 2021-11-05 1:51 ` Stephen Rothwell
2021-11-10 23:05 ` Stephen Rothwell
1 sibling, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2021-11-05 1:51 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Daniel Vetter, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI
Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Matthew Auld
[-- Attachment #1: Type: text/plain, Size: 1697 bytes --]
Hi all,
On Thu, 28 Oct 2021 18:27:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the char-misc tree with the drm-intel tree
2021-11-05 1:51 ` Stephen Rothwell
@ 2021-11-10 23:05 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2021-11-10 23:05 UTC (permalink / raw)
To: Dave Airlie
Cc: Greg KH, Arnd Bergmann, Daniel Vetter, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI,
Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Matthew Auld
[-- Attachment #1: Type: text/plain, Size: 1896 bytes --]
Hi all,
On Fri, 5 Nov 2021 12:51:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 28 Oct 2021 18:27:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-10 23:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-28 7:27 linux-next: manual merge of the char-misc tree with the drm-intel tree Stephen Rothwell
2021-10-29 7:45 ` Greg KH
2021-11-05 1:51 ` Stephen Rothwell
2021-11-10 23:05 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).