From: Wolfram Sang <wsa@the-dreams.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chris Wilson <chris@chris-wilson.co.uk>,
Bibby Hsieh <bibby.hsieh@mediatek.com>,
Hsin-Yi Wang <hsinyi@chromium.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Dave Airlie <airlied@linux.ie>
Subject: Re: linux-next: build failure after merge of the i2c tree
Date: Tue, 1 Jun 2021 10:55:11 +0200 [thread overview]
Message-ID: <YLX176D9oD7ZTSkT@ninjato> (raw)
In-Reply-To: <20210601103250.07301254@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2021-06-01 9:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 0:32 linux-next: build failure after merge of the i2c tree Stephen Rothwell
2021-06-01 8:55 ` Wolfram Sang [this message]
2021-06-01 9:09 ` Hsin-Yi Wang
2021-06-01 9:21 ` Wolfram Sang
-- strict thread matches above, loose matches on Subject: below --
2022-10-04 0:20 Stephen Rothwell
2022-10-04 6:22 ` Uwe Kleine-König
2022-10-05 23:05 ` Stephen Rothwell
2017-11-28 0:02 Stephen Rothwell
2017-11-28 9:53 ` Wolfram Sang
2017-06-26 1:09 Stephen Rothwell
2017-06-26 2:04 ` Shawn Guo
2015-12-16 4:48 Stephen Rothwell
2016-01-04 23:55 ` Stephen Rothwell
2016-01-05 1:04 ` Wolfram Sang
2015-08-25 0:51 Stephen Rothwell
2015-08-26 0:01 ` Dmitry Torokhov
2015-01-16 2:22 Stephen Rothwell
2015-01-16 7:16 ` Pantelis Antoniou
2014-11-24 9:16 Stephen Rothwell
2014-11-24 9:24 ` Wolfram Sang
2013-11-17 23:29 Stephen Rothwell
2011-05-19 3:27 Stephen Rothwell
2011-05-19 9:06 ` Jean Delvare
2010-06-21 2:03 Stephen Rothwell
2010-06-21 5:57 ` Jean Delvare
2010-06-21 7:09 ` Stephen Rothwell
2010-03-01 2:12 Stephen Rothwell
2010-03-01 10:43 ` Jean Delvare
2010-03-02 0:31 ` Stephen Rothwell
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=YLX176D9oD7ZTSkT@ninjato \
--to=wsa@the-dreams.de \
--cc=airlied@linux.ie \
--cc=bibby.hsieh@mediatek.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hsinyi@chromium.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=rodrigo.vivi@intel.com \
--cc=sfr@canb.auug.org.au \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).