* [Intel-gfx] [PATCH] gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
@ 2021-08-02 7:07 zhouchuangao
2021-08-02 13:56 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
0 siblings, 1 reply; 3+ messages in thread
From: zhouchuangao @ 2021-08-02 7:07 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Chris Wilson, Matthew Auld, Thomas Zimmermann,
Thomas Hellström, Zbigniew Kempczyński, zhouchuangao,
intel-gfx, dri-devel, linux-kernel
Duplicate include header file "intel_region_lmem.h"
line 8: #include "intel_region_lmem.h"
line 12: #include "intel_region_lmem.h"
Signed-off-by: zhouchuangao <zhouchuangao@vivo.com>
---
drivers/gpu/drm/i915/gt/intel_region_lmem.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index f7366b0..119eeec 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -9,7 +9,6 @@
#include "intel_region_ttm.h"
#include "gem/i915_gem_lmem.h"
#include "gem/i915_gem_region.h"
-#include "intel_region_lmem.h"
static int init_fake_lmem_bar(struct intel_memory_region *mem)
{
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Intel-gfx] ✗ Fi.CI.BUILD: failure for gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
2021-08-02 7:07 [Intel-gfx] [PATCH] gpu/drm/i915: Remove duplicated include of intel_region_lmem.h zhouchuangao
@ 2021-08-02 13:56 ` Patchwork
0 siblings, 0 replies; 3+ messages in thread
From: Patchwork @ 2021-08-02 13:56 UTC (permalink / raw)
To: zhouchuangao; +Cc: intel-gfx
== Series Details ==
Series: gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
URL : https://patchwork.freedesktop.org/series/93305/
State : failure
== Summary ==
Applying: gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_region_lmem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_region_lmem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_region_lmem.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 gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] [PATCH] gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
@ 2021-08-07 8:52 zhouchuangao
0 siblings, 0 replies; 3+ messages in thread
From: zhouchuangao @ 2021-08-07 8:52 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Chris Wilson, Matthew Auld, Thomas Hellström,
Thomas Zimmermann, Matt Roper, CQ Tang, intel-gfx, dri-devel,
linux-kernel
Cc: zhouchuangao
Duplicate include header file "intel_region_lmem.h"
line 8: #include "intel_region_lmem.h"
line 13: #include "intel_region_lmem.h"
Signed-off-by: zhouchuangao <zhouchuangao@vivo.com>
---
drivers/gpu/drm/i915/gt/intel_region_lmem.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index 58a3cf7..50d11a8 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -10,7 +10,6 @@
#include "gem/i915_gem_lmem.h"
#include "gem/i915_gem_region.h"
#include "gem/i915_gem_ttm.h"
-#include "intel_region_lmem.h"
static int init_fake_lmem_bar(struct intel_memory_region *mem)
{
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-09 13:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-02 7:07 [Intel-gfx] [PATCH] gpu/drm/i915: Remove duplicated include of intel_region_lmem.h zhouchuangao
2021-08-02 13:56 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2021-08-07 8:52 [Intel-gfx] [PATCH] " zhouchuangao
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).