[Intel-gfx] [PATCH] drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c

[Intel-gfx] [PATCH] drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c

[cgel.zte]

From: Yao Jing <yao.jing2@zte.com.cn>

'asm/smp.h' included in 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c' is
duplicated. It is clearly included on the 12 line.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Yao Jing <yao.jing2@zte.com.cn>
---
 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index f291cf4c3886..5712b6b5f285 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@ -17,9 +17,7 @@
 
 MODULE_IMPORT_NS(DMA_BUF);
 
-#if defined(CONFIG_X86)
-#include <asm/smp.h>
-#else
+#if !defined(CONFIG_X86)
 #define wbinvd_on_all_cpus() \
 	pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__)
 #endif
-- 
2.25.1

Re: [Intel-gfx] [PATCH] drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c

[Jani Nikula]

On Wed, 24 Nov 2021, cgel.zte@gmail.com wrote:
> From: Yao Jing <yao.jing2@zte.com.cn>
>
> 'asm/smp.h' included in 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c' is
> duplicated. It is clearly included on the 12 line.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Yao Jing <yao.jing2@zte.com.cn>

The correct fix is [1].

If you keep sending patches from cgel.zte@gmail.com, you need to add
your Signed-off-by too.

BR,
Jani.


[1] https://patchwork.freedesktop.org/patch/msgid/20211122135758.85444-1-tvrtko.ursulin@linux.intel.com



> ---
>  drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> index f291cf4c3886..5712b6b5f285 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> @@ -17,9 +17,7 @@
>  
>  MODULE_IMPORT_NS(DMA_BUF);
>  
> -#if defined(CONFIG_X86)
> -#include <asm/smp.h>
> -#else
> +#if !defined(CONFIG_X86)
>  #define wbinvd_on_all_cpus() \
>  	pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__)
>  #endif

-- 
Jani Nikula, Intel Open Source Graphics Center

[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c

[Patchwork]

== Series Details ==

Series: drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c
URL   : https://patchwork.freedesktop.org/series/97244/
State : failure

== Summary ==

Applying: drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".