From: Stephen Rothwell <sfr@canb.auug.org.au> To: Greg KH <greg@kroah.com>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Douglas Anderson" <dianders@chromium.org>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Linux Next Mailing List" <linux-next@vger.kernel.org> Subject: linux-next: build failure after merge of the driver-core tree Date: Fri, 23 Jul 2021 15:09:44 +1000 [thread overview] Message-ID: <20210723150944.528c10af@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1962 bytes --] Hi all, After merging the driver-core tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/drm_dp_aux_bus.c:106:13: error: initialization of 'void (*)(struct device *)' from incompatible pointer type 'int (*)(struct device *)' [-Werror=incompatible-pointer-types] 106 | .remove = dp_aux_ep_remove, | ^~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_aux_bus.c:106:13: note: (near initialization for 'dp_aux_bus_type.remove') Caused by commit aeb33699fc2c ("drm: Introduce the DP AUX bus") from the drm tree interacting with commit fc7a6209d571 ("bus: Make remove callback return void") from the driver-core tree. I applied the following merge fix patch. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 23 Jul 2021 14:58:25 +1000 Subject: [PATCH] fix for "drm: Introduce the DP AUX bus" interaction with "bus: Make remove callback return void" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/drm_dp_aux_bus.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_aux_bus.c b/drivers/gpu/drm/drm_dp_aux_bus.c index e49a70f3691b..298ea7a49591 100644 --- a/drivers/gpu/drm/drm_dp_aux_bus.c +++ b/drivers/gpu/drm/drm_dp_aux_bus.c @@ -67,9 +67,8 @@ static int dp_aux_ep_probe(struct device *dev) * * Calls through to the endpoint driver remove. * - * Return: 0 if no error or negative error code. */ -static int dp_aux_ep_remove(struct device *dev) +static void dp_aux_ep_remove(struct device *dev) { struct dp_aux_ep_driver *aux_ep_drv = to_dp_aux_ep_drv(dev->driver); struct dp_aux_ep_device *aux_ep = to_dp_aux_ep_dev(dev); @@ -77,8 +76,6 @@ static int dp_aux_ep_remove(struct device *dev) if (aux_ep_drv->remove) aux_ep_drv->remove(aux_ep); dev_pm_domain_detach(dev, true); - - return 0; } /** -- 2.30.2 -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Greg KH <greg@kroah.com>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Linux Next Mailing List" <linux-next@vger.kernel.org>, "Douglas Anderson" <dianders@chromium.org>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> Subject: linux-next: build failure after merge of the driver-core tree Date: Fri, 23 Jul 2021 15:09:44 +1000 [thread overview] Message-ID: <20210723150944.528c10af@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1962 bytes --] Hi all, After merging the driver-core tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/drm_dp_aux_bus.c:106:13: error: initialization of 'void (*)(struct device *)' from incompatible pointer type 'int (*)(struct device *)' [-Werror=incompatible-pointer-types] 106 | .remove = dp_aux_ep_remove, | ^~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_aux_bus.c:106:13: note: (near initialization for 'dp_aux_bus_type.remove') Caused by commit aeb33699fc2c ("drm: Introduce the DP AUX bus") from the drm tree interacting with commit fc7a6209d571 ("bus: Make remove callback return void") from the driver-core tree. I applied the following merge fix patch. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 23 Jul 2021 14:58:25 +1000 Subject: [PATCH] fix for "drm: Introduce the DP AUX bus" interaction with "bus: Make remove callback return void" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/drm_dp_aux_bus.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_aux_bus.c b/drivers/gpu/drm/drm_dp_aux_bus.c index e49a70f3691b..298ea7a49591 100644 --- a/drivers/gpu/drm/drm_dp_aux_bus.c +++ b/drivers/gpu/drm/drm_dp_aux_bus.c @@ -67,9 +67,8 @@ static int dp_aux_ep_probe(struct device *dev) * * Calls through to the endpoint driver remove. * - * Return: 0 if no error or negative error code. */ -static int dp_aux_ep_remove(struct device *dev) +static void dp_aux_ep_remove(struct device *dev) { struct dp_aux_ep_driver *aux_ep_drv = to_dp_aux_ep_drv(dev->driver); struct dp_aux_ep_device *aux_ep = to_dp_aux_ep_dev(dev); @@ -77,8 +76,6 @@ static int dp_aux_ep_remove(struct device *dev) if (aux_ep_drv->remove) aux_ep_drv->remove(aux_ep); dev_pm_domain_detach(dev, true); - - return 0; } /** -- 2.30.2 -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-07-23 5:09 UTC|newest] Thread overview: 197+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-23 5:09 Stephen Rothwell [this message] 2021-07-23 5:09 ` linux-next: build failure after merge of the driver-core tree Stephen Rothwell 2021-07-23 5:34 ` Uwe Kleine-König 2021-07-23 5:34 ` Uwe Kleine-König 2021-08-10 12:13 ` Geert Uytterhoeven 2021-08-10 12:13 ` Geert Uytterhoeven 2021-08-12 20:51 ` Doug Anderson 2021-08-12 20:51 ` Doug Anderson -- strict thread matches above, loose matches on Subject: below -- 2023-08-15 7:24 Stephen Rothwell 2023-08-15 15:21 ` Greg KH 2023-08-16 7:39 ` Maxime Ripard 2023-04-11 4:38 Stephen Rothwell 2023-04-11 4:38 ` Stephen Rothwell 2023-04-11 9:55 ` Daniel Vetter 2023-04-11 9:55 ` Daniel Vetter 2023-04-11 10:40 ` Greg KH 2023-04-11 15:01 ` Daniel Vetter 2023-04-11 15:01 ` Daniel Vetter 2023-04-11 15:08 ` Jeffrey Hugo 2023-04-11 15:13 ` Greg KH 2023-04-11 15:13 ` Greg KH 2023-04-11 15:26 ` Jeffrey Hugo 2023-04-11 15:26 ` Jeffrey Hugo 2023-04-11 15:29 ` Jeffrey Hugo 2023-04-11 15:29 ` Jeffrey Hugo 2023-04-11 16:31 ` Daniel Vetter 2023-04-11 16:31 ` Daniel Vetter 2023-04-11 17:18 ` Jeffrey Hugo 2023-04-11 18:21 ` Daniel Vetter 2023-04-11 18:21 ` Daniel Vetter 2023-04-11 18:37 ` Jeffrey Hugo 2023-04-11 18:47 ` Daniel Vetter 2023-04-11 18:47 ` Daniel Vetter 2023-04-12 6:11 ` Greg KH 2023-03-27 4:46 Stephen Rothwell 2023-03-27 7:33 ` Greg KH 2023-03-27 8:22 ` Stephen Rothwell 2023-03-27 9:15 ` Greg KH 2023-03-27 15:09 ` Vasily Gorbik 2023-01-30 4:28 Stephen Rothwell 2023-01-30 16:01 ` Greg KH 2023-01-30 16:23 ` Geert Uytterhoeven 2022-12-01 2:18 Stephen Rothwell 2022-12-01 2:18 ` Stephen Rothwell 2022-11-30 1:38 Stephen Rothwell 2022-11-30 12:01 ` Greg KH 2022-11-28 2:36 Stephen Rothwell 2022-11-28 11:50 ` Greg KH 2022-11-28 12:44 ` Stephen Rothwell 2022-11-28 16:22 ` Greg KH 2022-11-28 19:46 ` Stephen Rothwell 2022-11-29 8:28 ` Greg KH 2022-11-28 17:35 ` Greg KH 2022-11-14 4:12 Stephen Rothwell 2022-11-14 8:46 ` Andy Shevchenko 2022-11-14 8:59 ` Greg KH 2021-02-10 10:47 Stephen Rothwell 2021-02-10 18:18 ` Greg KH 2021-02-10 19:06 ` Saravana Kannan 2021-02-10 19:17 ` Saravana Kannan 2021-02-10 19:36 ` Greg KH 2021-02-10 20:14 ` Rob Herring 2021-02-10 20:43 ` Saravana Kannan 2021-02-10 20:59 ` Rob Herring 2020-09-09 5:47 Stephen Rothwell 2020-09-09 7:21 ` Greg KH 2020-09-09 21:47 ` Kees Cook 2020-09-09 7:28 ` Greg KH 2020-07-27 6:55 Stephen Rothwell 2020-07-27 10:17 ` Greg KH 2020-07-28 19:53 ` Kees Cook 2019-09-18 17:09 Mark Brown 2019-09-18 18:52 ` Greg KH 2019-09-18 19:03 ` Linus Torvalds 2019-09-18 19:07 ` Greg KH 2019-09-18 20:56 ` Suzuki K Poulose 2019-09-18 21:55 ` Mark Brown 2019-08-29 7:35 Stephen Rothwell 2019-08-29 10:10 ` Greg KH 2019-02-01 2:41 Stephen Rothwell 2019-02-01 14:18 ` Greg KH 2017-06-13 6:04 Stephen Rothwell 2017-06-13 6:20 ` Greg KH 2017-06-13 6:25 ` Stephen Rothwell 2017-06-13 6:30 ` Sergey Senozhatsky 2016-05-02 5:42 Stephen Rothwell 2016-05-02 11:40 ` William Breathitt Gray 2016-05-02 14:47 ` Greg KH 2015-05-21 7:52 Stephen Rothwell 2014-12-01 7:49 Stephen Rothwell 2014-05-28 8:03 Stephen Rothwell 2014-05-28 9:30 ` Jean Delvare 2014-03-12 0:51 Mark Brown 2014-03-12 1:50 ` Greg KH 2014-03-12 3:55 ` Benjamin Herrenschmidt 2014-03-12 11:37 ` Mark Brown 2014-03-12 19:59 ` Benjamin Herrenschmidt 2014-03-12 20:02 ` Tejun Heo 2014-03-12 20:14 ` Benjamin Herrenschmidt 2014-03-12 20:21 ` Tejun Heo 2014-03-13 0:37 ` Benjamin Herrenschmidt 2014-03-13 22:14 ` Benjamin Herrenschmidt 2014-03-14 13:00 ` Tejun Heo 2014-03-15 0:03 ` Greg KH 2014-03-15 2:57 ` Benjamin Herrenschmidt 2014-03-15 5:29 ` Greg KH 2014-03-15 7:14 ` Benjamin Herrenschmidt 2014-03-16 23:16 ` Stephen Rothwell 2014-03-17 18:36 ` Greg KH 2014-03-16 23:16 ` Stephen Rothwell 2014-03-17 18:33 ` Greg KH 2014-03-17 20:33 ` Benjamin Herrenschmidt 2014-03-17 21:56 ` Greg KH 2014-03-17 22:05 ` Tejun Heo 2014-03-17 22:21 ` Tejun Heo 2014-03-18 0:07 ` Stewart Smith 2014-03-18 0:22 ` Benjamin Herrenschmidt 2014-03-18 15:58 ` Tejun Heo 2014-03-18 0:00 ` Stewart Smith 2014-03-18 0:16 ` Benjamin Herrenschmidt 2014-03-17 8:28 ` Stephen Rothwell 2013-08-22 5:39 Stephen Rothwell 2013-08-22 15:36 ` Greg KH 2013-01-18 2:29 Stephen Rothwell 2013-01-18 4:13 ` Greg KH 2013-01-18 14:14 ` Kondratiev, Vladimir 2012-08-17 4:01 Stephen Rothwell 2012-08-17 13:25 ` Greg KH 2012-07-10 5:32 Stephen Rothwell 2012-07-10 9:03 ` Mark Brown 2012-07-10 11:14 ` Stephen Rothwell 2012-07-10 21:10 ` Linus Walleij 2012-05-01 4:59 Stephen Rothwell 2012-05-01 7:05 ` Bart Van Assche 2012-05-01 13:45 ` Greg KH 2012-04-19 4:48 Stephen Rothwell 2012-04-19 20:07 ` Greg KH 2012-04-20 2:19 ` Greg KH 2012-01-27 2:59 Stephen Rothwell 2012-01-27 15:24 ` Alan Stern 2012-01-27 15:24 ` Alan Stern 2012-01-27 22:36 ` Greg KH 2012-01-05 6:28 Stephen Rothwell 2012-01-05 23:20 ` Greg KH 2011-12-28 6:45 Stephen Rothwell 2012-01-03 16:21 ` Greg KH 2012-01-04 0:07 ` Kay Sievers 2012-01-04 0:31 ` Greg KH 2012-01-04 22:03 ` Kay Sievers 2012-01-04 23:13 ` Greg KH 2012-01-04 23:07 ` Greg KH 2012-01-04 23:48 ` Stephen Rothwell 2012-01-05 0:01 ` Kay Sievers 2012-01-05 0:17 ` Stephen Rothwell 2012-01-05 0:57 ` Josh Triplett 2011-12-15 6:37 Stephen Rothwell 2011-12-15 7:21 ` Greg KH 2011-12-15 10:10 ` Kay Sievers 2011-12-15 19:09 ` Greg KH 2011-12-14 4:48 Stephen Rothwell 2011-12-14 9:24 ` Peter Zijlstra 2011-12-14 15:03 ` Greg KH 2011-12-14 15:13 ` Peter Zijlstra 2011-12-14 17:01 ` Greg KH 2011-12-14 19:24 ` Greg KH 2011-11-21 1:57 Stephen Rothwell 2010-08-04 4:25 Stephen Rothwell 2010-08-04 4:44 ` Guenter Roeck 2010-08-04 15:52 ` Greg KH 2010-08-04 21:24 ` Jesse Barnes 2010-05-18 6:45 Stephen Rothwell 2010-05-18 7:00 ` Eric W. Biederman 2010-05-18 7:48 ` Al Viro 2010-05-18 7:54 ` Stephen Rothwell 2010-05-18 7:54 ` Stephen Rothwell 2010-05-18 10:35 ` Eric W. Biederman 2010-05-18 15:02 ` Al Viro 2010-05-18 19:58 ` Eric W. Biederman 2010-05-18 21:25 ` Greg KH 2010-05-18 21:59 ` Eric W. Biederman 2010-05-18 6:44 Stephen Rothwell 2010-05-18 14:02 ` Greg KH 2010-05-18 14:04 ` Chris Wright 2010-05-18 21:06 ` Chris Wright 2010-05-18 21:24 ` Greg KH 2010-03-17 4:41 Stephen Rothwell 2010-03-17 7:21 ` Neil Brown 2010-03-17 15:51 ` Sage Weil 2010-03-17 22:30 ` Stephen Rothwell 2010-03-24 1:37 ` Neil Brown 2010-03-24 14:54 ` Sage Weil 2010-03-03 6:14 Stephen Rothwell 2010-03-03 6:31 ` Stephen Rothwell 2010-02-16 6:39 Stephen Rothwell 2010-02-16 9:01 ` Jean Delvare 2010-02-17 4:56 ` Greg KH 2010-02-18 4:27 ` Greg KH
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210723150944.528c10af@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=airlied@linux.ie \ --cc=dianders@chromium.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=greg@kroah.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=u.kleine-koenig@pengutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.