* [PATCH] drm/i915: Remove duplicate include of intel_region_lmem.h
@ 2021-06-15 11:35 ` Wan Jiabing
0 siblings, 0 replies; 6+ messages in thread
From: Wan Jiabing @ 2021-06-15 11:35 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Chris Wilson, Matthew Auld, Thomas Zimmermann,
CQ Tang, Zbigniew Kempczyński, intel-gfx, dri-devel,
linux-kernel
Cc: Wan Jiabing
Fix the following checkinclude.pl warning:
drivers/gpu/drm/i915/gt/intel_region_lmem.c
8 #include "intel_region_lmem.h"
12 #include "intel_region_lmem.h"
Signed-off-by: Wan Jiabing <wanjiabing@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 f7366b054f8e..119eeec98837 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.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] [PATCH] drm/i915: Remove duplicate include of intel_region_lmem.h
@ 2021-06-15 11:35 ` Wan Jiabing
0 siblings, 0 replies; 6+ messages in thread
From: Wan Jiabing @ 2021-06-15 11:35 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Chris Wilson, Matthew Auld, Thomas Zimmermann,
CQ Tang, Zbigniew Kempczyński, intel-gfx, dri-devel,
linux-kernel
Cc: Wan Jiabing
Fix the following checkinclude.pl warning:
drivers/gpu/drm/i915/gt/intel_region_lmem.c
8 #include "intel_region_lmem.h"
12 #include "intel_region_lmem.h"
Signed-off-by: Wan Jiabing <wanjiabing@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 f7366b054f8e..119eeec98837 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.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Remove duplicate include of intel_region_lmem.h
2021-06-15 11:35 ` [Intel-gfx] " Wan Jiabing
(?)
@ 2021-06-15 15:14 ` Patchwork
-1 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2021-06-15 15:14 UTC (permalink / raw)
To: Wan Jiabing; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Remove duplicate include of intel_region_lmem.h
URL : https://patchwork.freedesktop.org/series/91525/
State : failure
== Summary ==
Applying: drm/i915: Remove duplicate 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 drm/i915: Remove duplicate 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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Remove duplicate include of intel_region_lmem.h
2021-06-15 11:35 ` [Intel-gfx] " Wan Jiabing
(?)
@ 2021-06-17 17:36 ` Daniel Vetter
-1 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2021-06-17 17:36 UTC (permalink / raw)
To: Wan Jiabing
Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Chris Wilson, Matthew Auld, Thomas Zimmermann,
CQ Tang, Zbigniew Kempczyński, intel-gfx, dri-devel,
linux-kernel
On Tue, Jun 15, 2021 at 07:35:20PM +0800, Wan Jiabing wrote:
> Fix the following checkinclude.pl warning:
> drivers/gpu/drm/i915/gt/intel_region_lmem.c
> 8 #include "intel_region_lmem.h"
> 12 #include "intel_region_lmem.h"
>
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Applied to drm-intel-gt-next, thanks for your patch.
-Daniel
> ---
> 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 f7366b054f8e..119eeec98837 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.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Remove duplicate include of intel_region_lmem.h
@ 2021-06-17 17:36 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2021-06-17 17:36 UTC (permalink / raw)
To: Wan Jiabing
Cc: dri-devel, Thomas Zimmermann, David Airlie, linux-kernel,
intel-gfx, Zbigniew Kempczyński, Chris Wilson, CQ Tang,
Matthew Auld, Rodrigo Vivi
On Tue, Jun 15, 2021 at 07:35:20PM +0800, Wan Jiabing wrote:
> Fix the following checkinclude.pl warning:
> drivers/gpu/drm/i915/gt/intel_region_lmem.c
> 8 #include "intel_region_lmem.h"
> 12 #include "intel_region_lmem.h"
>
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Applied to drm-intel-gt-next, thanks for your patch.
-Daniel
> ---
> 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 f7366b054f8e..119eeec98837 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.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Remove duplicate include of intel_region_lmem.h
@ 2021-06-17 17:36 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2021-06-17 17:36 UTC (permalink / raw)
To: Wan Jiabing
Cc: dri-devel, Thomas Zimmermann, David Airlie, linux-kernel,
intel-gfx, Chris Wilson, Matthew Auld
On Tue, Jun 15, 2021 at 07:35:20PM +0800, Wan Jiabing wrote:
> Fix the following checkinclude.pl warning:
> drivers/gpu/drm/i915/gt/intel_region_lmem.c
> 8 #include "intel_region_lmem.h"
> 12 #include "intel_region_lmem.h"
>
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Applied to drm-intel-gt-next, thanks for your patch.
-Daniel
> ---
> 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 f7366b054f8e..119eeec98837 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.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-17 17:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-15 11:35 [PATCH] drm/i915: Remove duplicate include of intel_region_lmem.h Wan Jiabing
2021-06-15 11:35 ` [Intel-gfx] " Wan Jiabing
2021-06-15 15:14 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2021-06-17 17:36 ` [PATCH] " Daniel Vetter
2021-06-17 17:36 ` [Intel-gfx] " Daniel Vetter
2021-06-17 17:36 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.