* linux-next: build failure after merge of the i2c tree
@ 2021-06-01 0:32 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2021-06-01 0:32 UTC (permalink / raw)
To: Wolfram Sang, Chris Wilson
Cc: Bibby Hsieh, Hsin-Yi Wang, Marek Szyprowski,
Linux Kernel Mailing List, Linux Next Mailing List,
Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 3567 bytes --]
Hi all,
After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
97 | static void pm_suspend(struct drm_i915_private *i915)
| ^~~~~~~~~~
In file included from include/linux/regulator/consumer.h:35,
from include/linux/i2c.h:18,
from drivers/gpu/drm/i915/i915_drv.h:39,
from drivers/gpu/drm/i915/gt/intel_context.h:14,
from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
from drivers/gpu/drm/i915/i915_gem.c:44:
include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
331 | extern int pm_suspend(suspend_state_t state);
| ^~~~~~~~~~
Caused by commit
5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
interacting with commit
3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
from Linus' tree (v4.20-rc1)
I have added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Jun 2021 10:25:49 +1000
Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index dc394fb7ccfa..5d674708b047 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915)
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
}
-static int pm_prepare(struct drm_i915_private *i915)
+static int test_pm_prepare(struct drm_i915_private *i915)
{
i915_gem_suspend(i915);
return 0;
}
-static void pm_suspend(struct drm_i915_private *i915)
+static void test_pm_suspend(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915)
}
}
-static void pm_hibernate(struct drm_i915_private *i915)
+static void test_pm_hibernate(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
}
}
-static void pm_resume(struct drm_i915_private *i915)
+static void test_pm_resume(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg)
if (err)
goto out;
- err = pm_prepare(i915);
+ err = test_pm_prepare(i915);
if (err)
goto out;
- pm_suspend(i915);
+ test_pm_suspend(i915);
/* Here be dragons! Note that with S3RST any S3 may become S4! */
simulate_hibernate(i915);
- pm_resume(i915);
+ test_pm_resume(i915);
err = switch_to_context(ctx);
out:
@@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg)
if (err)
goto out;
- err = pm_prepare(i915);
+ err = test_pm_prepare(i915);
if (err)
goto out;
- pm_hibernate(i915);
+ test_pm_hibernate(i915);
/* Here be dragons! */
simulate_hibernate(i915);
- pm_resume(i915);
+ test_pm_resume(i915);
err = switch_to_context(ctx);
out:
--
2.30.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* linux-next: build failure after merge of the i2c tree
@ 2021-06-01 0:32 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2021-06-01 0:32 UTC (permalink / raw)
To: Wolfram Sang, Chris Wilson
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, Rodrigo Vivi, Linux Next Mailing List,
DRI, Hsin-Yi Wang, Marek Szyprowski
[-- Attachment #1: Type: text/plain, Size: 3567 bytes --]
Hi all,
After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
97 | static void pm_suspend(struct drm_i915_private *i915)
| ^~~~~~~~~~
In file included from include/linux/regulator/consumer.h:35,
from include/linux/i2c.h:18,
from drivers/gpu/drm/i915/i915_drv.h:39,
from drivers/gpu/drm/i915/gt/intel_context.h:14,
from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
from drivers/gpu/drm/i915/i915_gem.c:44:
include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
331 | extern int pm_suspend(suspend_state_t state);
| ^~~~~~~~~~
Caused by commit
5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
interacting with commit
3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
from Linus' tree (v4.20-rc1)
I have added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Jun 2021 10:25:49 +1000
Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index dc394fb7ccfa..5d674708b047 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915)
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
}
-static int pm_prepare(struct drm_i915_private *i915)
+static int test_pm_prepare(struct drm_i915_private *i915)
{
i915_gem_suspend(i915);
return 0;
}
-static void pm_suspend(struct drm_i915_private *i915)
+static void test_pm_suspend(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915)
}
}
-static void pm_hibernate(struct drm_i915_private *i915)
+static void test_pm_hibernate(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
}
}
-static void pm_resume(struct drm_i915_private *i915)
+static void test_pm_resume(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg)
if (err)
goto out;
- err = pm_prepare(i915);
+ err = test_pm_prepare(i915);
if (err)
goto out;
- pm_suspend(i915);
+ test_pm_suspend(i915);
/* Here be dragons! Note that with S3RST any S3 may become S4! */
simulate_hibernate(i915);
- pm_resume(i915);
+ test_pm_resume(i915);
err = switch_to_context(ctx);
out:
@@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg)
if (err)
goto out;
- err = pm_prepare(i915);
+ err = test_pm_prepare(i915);
if (err)
goto out;
- pm_hibernate(i915);
+ test_pm_hibernate(i915);
/* Here be dragons! */
simulate_hibernate(i915);
- pm_resume(i915);
+ test_pm_resume(i915);
err = switch_to_context(ctx);
out:
--
2.30.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Intel-gfx] linux-next: build failure after merge of the i2c tree
@ 2021-06-01 0:32 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2021-06-01 0:32 UTC (permalink / raw)
To: Wolfram Sang, Chris Wilson
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, Linux Next Mailing List, DRI,
Bibby Hsieh, Hsin-Yi Wang, Marek Szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 3567 bytes --]
Hi all,
After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
97 | static void pm_suspend(struct drm_i915_private *i915)
| ^~~~~~~~~~
In file included from include/linux/regulator/consumer.h:35,
from include/linux/i2c.h:18,
from drivers/gpu/drm/i915/i915_drv.h:39,
from drivers/gpu/drm/i915/gt/intel_context.h:14,
from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
from drivers/gpu/drm/i915/i915_gem.c:44:
include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
331 | extern int pm_suspend(suspend_state_t state);
| ^~~~~~~~~~
Caused by commit
5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
interacting with commit
3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
from Linus' tree (v4.20-rc1)
I have added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Jun 2021 10:25:49 +1000
Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index dc394fb7ccfa..5d674708b047 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915)
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
}
-static int pm_prepare(struct drm_i915_private *i915)
+static int test_pm_prepare(struct drm_i915_private *i915)
{
i915_gem_suspend(i915);
return 0;
}
-static void pm_suspend(struct drm_i915_private *i915)
+static void test_pm_suspend(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915)
}
}
-static void pm_hibernate(struct drm_i915_private *i915)
+static void test_pm_hibernate(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
}
}
-static void pm_resume(struct drm_i915_private *i915)
+static void test_pm_resume(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg)
if (err)
goto out;
- err = pm_prepare(i915);
+ err = test_pm_prepare(i915);
if (err)
goto out;
- pm_suspend(i915);
+ test_pm_suspend(i915);
/* Here be dragons! Note that with S3RST any S3 may become S4! */
simulate_hibernate(i915);
- pm_resume(i915);
+ test_pm_resume(i915);
err = switch_to_context(ctx);
out:
@@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg)
if (err)
goto out;
- err = pm_prepare(i915);
+ err = test_pm_prepare(i915);
if (err)
goto out;
- pm_hibernate(i915);
+ test_pm_hibernate(i915);
/* Here be dragons! */
simulate_hibernate(i915);
- pm_resume(i915);
+ test_pm_resume(i915);
err = switch_to_context(ctx);
out:
--
2.30.2
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the i2c tree
2021-06-01 0:32 ` Stephen Rothwell
(?)
(?)
@ 2021-06-01 0:35 ` Patchwork
-1 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2021-06-01 0:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the i2c tree
URL : https://patchwork.freedesktop.org/series/90804/
State : failure
== Summary ==
Applying: linux-next: build failure after merge of the i2c tree
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/selftests/i915_gem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem.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 linux-next: build failure after merge of the i2c tree
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] 13+ messages in thread
* Re: linux-next: build failure after merge of the i2c tree
2021-06-01 0:32 ` Stephen Rothwell
(?)
@ 2021-06-01 8:55 ` Wolfram Sang
-1 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2021-06-01 8:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Chris Wilson, Bibby Hsieh, Hsin-Yi Wang, Marek Szyprowski,
Linux Kernel Mailing List, Linux Next Mailing List,
Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
Hi Stephen,
> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
> 97 | static void pm_suspend(struct drm_i915_private *i915)
> | ^~~~~~~~~~
> In file included from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from drivers/gpu/drm/i915/i915_drv.h:39,
> from drivers/gpu/drm/i915/gt/intel_context.h:14,
> from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
> from drivers/gpu/drm/i915/i915_gem.c:44:
> include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
> 331 | extern int pm_suspend(suspend_state_t state);
> | ^~~~~~~~~~
>
> Caused by commit
>
> 5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
>
> interacting with commit
>
> 3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
>
> from Linus' tree (v4.20-rc1)
Thank you very much for taking care of this!
> I have added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 1 Jun 2021 10:25:49 +1000
> Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Looks like the proper solution to me. I think this should be added to
the i915 tree. D'accord everyone?
Reviewed-by: Wolfram Sang <wsa@kernel.org>
Kind regards,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: build failure after merge of the i2c tree
@ 2021-06-01 8:55 ` Wolfram Sang
0 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2021-06-01 8:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, Chris Wilson, Rodrigo Vivi,
Linux Next Mailing List, DRI, Hsin-Yi Wang, Marek Szyprowski
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
Hi Stephen,
> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
> 97 | static void pm_suspend(struct drm_i915_private *i915)
> | ^~~~~~~~~~
> In file included from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from drivers/gpu/drm/i915/i915_drv.h:39,
> from drivers/gpu/drm/i915/gt/intel_context.h:14,
> from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
> from drivers/gpu/drm/i915/i915_gem.c:44:
> include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
> 331 | extern int pm_suspend(suspend_state_t state);
> | ^~~~~~~~~~
>
> Caused by commit
>
> 5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
>
> interacting with commit
>
> 3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
>
> from Linus' tree (v4.20-rc1)
Thank you very much for taking care of this!
> I have added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 1 Jun 2021 10:25:49 +1000
> Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Looks like the proper solution to me. I think this should be added to
the i915 tree. D'accord everyone?
Reviewed-by: Wolfram Sang <wsa@kernel.org>
Kind regards,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the i2c tree
@ 2021-06-01 8:55 ` Wolfram Sang
0 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2021-06-01 8:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, Chris Wilson, Linux Next Mailing List,
DRI, Bibby Hsieh, Hsin-Yi Wang, Marek Szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 1716 bytes --]
Hi Stephen,
> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
> 97 | static void pm_suspend(struct drm_i915_private *i915)
> | ^~~~~~~~~~
> In file included from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from drivers/gpu/drm/i915/i915_drv.h:39,
> from drivers/gpu/drm/i915/gt/intel_context.h:14,
> from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
> from drivers/gpu/drm/i915/i915_gem.c:44:
> include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
> 331 | extern int pm_suspend(suspend_state_t state);
> | ^~~~~~~~~~
>
> Caused by commit
>
> 5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
>
> interacting with commit
>
> 3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
>
> from Linus' tree (v4.20-rc1)
Thank you very much for taking care of this!
> I have added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 1 Jun 2021 10:25:49 +1000
> Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Looks like the proper solution to me. I think this should be added to
the i915 tree. D'accord everyone?
Reviewed-by: Wolfram Sang <wsa@kernel.org>
Kind regards,
Wolfram
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: build failure after merge of the i2c tree
2021-06-01 8:55 ` Wolfram Sang
(?)
@ 2021-06-01 9:09 ` Hsin-Yi Wang
-1 siblings, 0 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2021-06-01 9:09 UTC (permalink / raw)
To: Wolfram Sang, Stephen Rothwell, Chris Wilson, Bibby Hsieh,
Hsin-Yi Wang, Marek Szyprowski, Linux Kernel Mailing List,
Linux Next Mailing List, Daniel Vetter, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie
On Tue, Jun 1, 2021 at 4:55 PM Wolfram Sang <wsa@the-dreams.de> wrote:
>
> Hi Stephen,
>
> > After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> > drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
> > 97 | static void pm_suspend(struct drm_i915_private *i915)
> > | ^~~~~~~~~~
> > In file included from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from drivers/gpu/drm/i915/i915_drv.h:39,
> > from drivers/gpu/drm/i915/gt/intel_context.h:14,
> > from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
> > from drivers/gpu/drm/i915/i915_gem.c:44:
> > include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
> > 331 | extern int pm_suspend(suspend_state_t state);
> > | ^~~~~~~~~~
> >
> > Caused by commit
> >
> > 5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
> >
> > interacting with commit
> >
> > 3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
> >
> > from Linus' tree (v4.20-rc1)
>
> Thank you very much for taking care of this!
>
Hi, this issue is fixed in
https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45
And I think the pull request is in
https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html
Thanks
>
> > I have added the following merge fix patch:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 1 Jun 2021 10:25:49 +1000
> > Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Looks like the proper solution to me. I think this should be added to
> the i915 tree. D'accord everyone?
>
> Reviewed-by: Wolfram Sang <wsa@kernel.org>
>
> Kind regards,
>
> Wolfram
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: build failure after merge of the i2c tree
@ 2021-06-01 9:09 ` Hsin-Yi Wang
0 siblings, 0 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2021-06-01 9:09 UTC (permalink / raw)
To: Wolfram Sang, Stephen Rothwell, Chris Wilson, Bibby Hsieh,
Hsin-Yi Wang, Marek Szyprowski, Linux Kernel Mailing List,
Linux Next Mailing List, Daniel Vetter, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie
On Tue, Jun 1, 2021 at 4:55 PM Wolfram Sang <wsa@the-dreams.de> wrote:
>
> Hi Stephen,
>
> > After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> > drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
> > 97 | static void pm_suspend(struct drm_i915_private *i915)
> > | ^~~~~~~~~~
> > In file included from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from drivers/gpu/drm/i915/i915_drv.h:39,
> > from drivers/gpu/drm/i915/gt/intel_context.h:14,
> > from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
> > from drivers/gpu/drm/i915/i915_gem.c:44:
> > include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
> > 331 | extern int pm_suspend(suspend_state_t state);
> > | ^~~~~~~~~~
> >
> > Caused by commit
> >
> > 5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
> >
> > interacting with commit
> >
> > 3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
> >
> > from Linus' tree (v4.20-rc1)
>
> Thank you very much for taking care of this!
>
Hi, this issue is fixed in
https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45
And I think the pull request is in
https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html
Thanks
>
> > I have added the following merge fix patch:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 1 Jun 2021 10:25:49 +1000
> > Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Looks like the proper solution to me. I think this should be added to
> the i915 tree. D'accord everyone?
>
> Reviewed-by: Wolfram Sang <wsa@kernel.org>
>
> Kind regards,
>
> Wolfram
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the i2c tree
@ 2021-06-01 9:09 ` Hsin-Yi Wang
0 siblings, 0 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2021-06-01 9:09 UTC (permalink / raw)
To: Wolfram Sang, Stephen Rothwell, Chris Wilson, Bibby Hsieh,
Hsin-Yi Wang, Marek Szyprowski, Linux Kernel Mailing List,
Linux Next Mailing List, Daniel Vetter, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie
On Tue, Jun 1, 2021 at 4:55 PM Wolfram Sang <wsa@the-dreams.de> wrote:
>
> Hi Stephen,
>
> > After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> > drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
> > 97 | static void pm_suspend(struct drm_i915_private *i915)
> > | ^~~~~~~~~~
> > In file included from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from drivers/gpu/drm/i915/i915_drv.h:39,
> > from drivers/gpu/drm/i915/gt/intel_context.h:14,
> > from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
> > from drivers/gpu/drm/i915/i915_gem.c:44:
> > include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
> > 331 | extern int pm_suspend(suspend_state_t state);
> > | ^~~~~~~~~~
> >
> > Caused by commit
> >
> > 5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
> >
> > interacting with commit
> >
> > 3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
> >
> > from Linus' tree (v4.20-rc1)
>
> Thank you very much for taking care of this!
>
Hi, this issue is fixed in
https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45
And I think the pull request is in
https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html
Thanks
>
> > I have added the following merge fix patch:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 1 Jun 2021 10:25:49 +1000
> > Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Looks like the proper solution to me. I think this should be added to
> the i915 tree. D'accord everyone?
>
> Reviewed-by: Wolfram Sang <wsa@kernel.org>
>
> Kind regards,
>
> Wolfram
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: build failure after merge of the i2c tree
2021-06-01 9:09 ` Hsin-Yi Wang
(?)
@ 2021-06-01 9:21 ` Wolfram Sang
-1 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2021-06-01 9:21 UTC (permalink / raw)
To: Hsin-Yi Wang
Cc: Stephen Rothwell, Chris Wilson, Bibby Hsieh, Marek Szyprowski,
Linux Kernel Mailing List, Linux Next Mailing List,
Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
> Hi, this issue is fixed in
> https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45
>
> And I think the pull request is in
> https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html
Thanks for the heads up. So, I'll wait with my pull request for the next
merge window until drm has landed first.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: build failure after merge of the i2c tree
@ 2021-06-01 9:21 ` Wolfram Sang
0 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2021-06-01 9:21 UTC (permalink / raw)
To: Hsin-Yi Wang
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, Chris Wilson, Linux Next Mailing List,
DRI, Rodrigo Vivi, Marek Szyprowski
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
> Hi, this issue is fixed in
> https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45
>
> And I think the pull request is in
> https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html
Thanks for the heads up. So, I'll wait with my pull request for the next
merge window until drm has landed first.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the i2c tree
@ 2021-06-01 9:21 ` Wolfram Sang
0 siblings, 0 replies; 13+ messages in thread
From: Wolfram Sang @ 2021-06-01 9:21 UTC (permalink / raw)
To: Hsin-Yi Wang
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, Chris Wilson, Linux Next Mailing List,
DRI, Bibby Hsieh, Marek Szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 381 bytes --]
> Hi, this issue is fixed in
> https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45
>
> And I think the pull request is in
> https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html
Thanks for the heads up. So, I'll wait with my pull request for the next
merge window until drm has landed first.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-06-01 9:21 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-01 0:32 linux-next: build failure after merge of the i2c tree Stephen Rothwell
2021-06-01 0:32 ` [Intel-gfx] " Stephen Rothwell
2021-06-01 0:32 ` Stephen Rothwell
2021-06-01 0:35 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2021-06-01 8:55 ` Wolfram Sang
2021-06-01 8:55 ` [Intel-gfx] " Wolfram Sang
2021-06-01 8:55 ` Wolfram Sang
2021-06-01 9:09 ` Hsin-Yi Wang
2021-06-01 9:09 ` [Intel-gfx] " Hsin-Yi Wang
2021-06-01 9:09 ` Hsin-Yi Wang
2021-06-01 9:21 ` Wolfram Sang
2021-06-01 9:21 ` [Intel-gfx] " Wolfram Sang
2021-06-01 9:21 ` Wolfram Sang
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.