* linux-next: build failure after merge of the drm-misc tree
@ 2019-10-07 23:30 Stephen Rothwell
2019-10-07 23:54 ` ✗ Fi.CI.BUILD: failure for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-10-07 23:30 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Mauro Carvalho Chehab
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Hans Verkuil
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
Caused by commit
10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
interacting with commit
7e86efa2ff03 ("media: cec-gpio: add notifier support")
form the v4l-dvb tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Oct 2019 10:26:05 +1100
Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
cec_notifier_cec_adap_unregister()"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
index 7be91e712c4a..42d2c2cd9a78 100644
--- a/drivers/media/platform/cec-gpio/cec-gpio.c
+++ b/drivers/media/platform/cec-gpio/cec-gpio.c
@@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
return 0;
unreg_notifier:
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
del_adap:
cec_delete_adapter(cec->adap);
return ret;
@@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
{
struct cec_gpio *cec = platform_get_drvdata(pdev);
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
cec_unregister_adapter(cec->adap);
return 0;
}
--
2.23.0.rc1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
@ 2019-10-07 23:54 ` Patchwork
2019-10-08 3:02 ` Stephen Rothwell
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2019-10-07 23:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/67718/
State : failure
== Summary ==
Applying: linux-next: build failure after merge of the drm-misc tree
error: sha1 information is lacking or useless (drivers/media/platform/cec-gpio/cec-gpio.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 linux-next: build failure after merge of the drm-misc 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] 8+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2019-10-07 23:54 ` ✗ Fi.CI.BUILD: failure for " Patchwork
@ 2019-10-08 3:02 ` Stephen Rothwell
2019-10-08 7:56 ` Hans Verkuil
2019-10-14 0:12 ` Stephen Rothwell
3 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-10-08 3:02 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Mauro Carvalho Chehab
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Hans Verkuil
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
Hi all,
On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
Sorry, forgot to include the error messages. But they shuld be clear
from the fix ...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2019-10-07 23:54 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-08 3:02 ` Stephen Rothwell
@ 2019-10-08 7:56 ` Hans Verkuil
2019-10-14 0:12 ` Stephen Rothwell
3 siblings, 0 replies; 8+ messages in thread
From: Hans Verkuil @ 2019-10-08 7:56 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Mauro Carvalho Chehab
Cc: Linux Next Mailing List, Linux Kernel Mailing List
On 10/8/19 1:30 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
>
> Caused by commit
>
> 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
>
> interacting with commit
>
> 7e86efa2ff03 ("media: cec-gpio: add notifier support")
>
> form the v4l-dvb tree.
>
> I have applied the following merge fix patch.
That's the correct fix, thank you!
Regards,
Hans
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
> cec_notifier_cec_adap_unregister()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
> return 0;
>
> unreg_notifier:
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> del_adap:
> cec_delete_adapter(cec->adap);
> return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
> {
> struct cec_gpio *cec = platform_get_drvdata(pdev);
>
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> cec_unregister_adapter(cec->adap);
> return 0;
> }
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
@ 2019-10-14 0:12 ` Stephen Rothwell
2019-10-08 3:02 ` Stephen Rothwell
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-10-14 0:12 UTC (permalink / raw)
To: DRI, Mauro Carvalho Chehab, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, Linux Next Mailing List,
Linux Kernel Mailing List, Hans Verkuil
[-- Attachment #1: Type: text/plain, Size: 2938 bytes --]
Hi all,
This is now a semantic conflict between the drm and v4l-dvb trees.
On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_probe':
drivers/media/platform/cec-gpio/cec-gpio.c:262:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
262 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_remove':
drivers/media/platform/cec-gpio/cec-gpio.c:272:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
272 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> Caused by commit
>
> 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
>
> interacting with commit
>
> 7e86efa2ff03 ("media: cec-gpio: add notifier support")
>
> form the v4l-dvb tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
> cec_notifier_cec_adap_unregister()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
> return 0;
>
> unreg_notifier:
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> del_adap:
> cec_delete_adapter(cec->adap);
> return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
> {
> struct cec_gpio *cec = platform_get_drvdata(pdev);
>
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> cec_unregister_adapter(cec->adap);
> return 0;
> }
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2019-10-14 0:12 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-10-14 0:12 UTC (permalink / raw)
To: DRI, Mauro Carvalho Chehab, Dave Airlie
Cc: Hans Verkuil, Daniel Vetter, Intel Graphics,
Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 2938 bytes --]
Hi all,
This is now a semantic conflict between the drm and v4l-dvb trees.
On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_probe':
drivers/media/platform/cec-gpio/cec-gpio.c:262:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
262 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_remove':
drivers/media/platform/cec-gpio/cec-gpio.c:272:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
272 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> Caused by commit
>
> 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
>
> interacting with commit
>
> 7e86efa2ff03 ("media: cec-gpio: add notifier support")
>
> form the v4l-dvb tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
> cec_notifier_cec_adap_unregister()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
> return 0;
>
> unreg_notifier:
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> del_adap:
> cec_delete_adapter(cec->adap);
> return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
> {
> struct cec_gpio *cec = platform_get_drvdata(pdev);
>
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> cec_unregister_adapter(cec->adap);
> return 0;
> }
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
2024-02-06 1:28 Stephen Rothwell
@ 2024-02-06 1:28 ` Patchwork
0 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2024-02-06 1:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/129558/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/129558/revisions/1/mbox/ not applied
Applying: linux-next: build failure after merge of the drm-misc tree
Using index info to reconstruct a base tree...
M drivers/gpu/drm/xe/xe_bo.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/xe/xe_bo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.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 drm-misc 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".
Build failed, no error log produced
^ permalink raw reply [flat|nested] 8+ messages in thread
* ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
2019-10-09 0:35 Stephen Rothwell
@ 2019-10-09 0:53 ` Patchwork
0 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2019-10-09 0:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/67759/
State : failure
== Summary ==
Applying: linux-next: build failure after merge of the drm-misc tree
error: sha1 information is lacking or useless (drivers/gpu/drm/amd/amdkfd/kfd_priv.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 linux-next: build failure after merge of the drm-misc 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] 8+ messages in thread
end of thread, other threads:[~2024-02-06 1:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-07 23:30 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2019-10-07 23:54 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-08 3:02 ` Stephen Rothwell
2019-10-08 7:56 ` Hans Verkuil
2019-10-14 0:12 ` Stephen Rothwell
2019-10-14 0:12 ` Stephen Rothwell
2019-10-09 0:35 Stephen Rothwell
2019-10-09 0:53 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2024-02-06 1:28 Stephen Rothwell
2024-02-06 1:28 ` ✗ Fi.CI.BUILD: failure for " Patchwork
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.