linux-kernel - Re: linux-next: build failure after merge of the i2c tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <YLX176D9oD7ZTSkT@ninjato>
Date:   Tue, 1 Jun 2021 10:55:11 +0200
From:   Wolfram Sang <wsa@...-dreams.de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Chris Wilson <chris@...is-wilson.co.uk>,
        Bibby Hsieh <bibby.hsieh@...iatek.com>,
        Hsin-Yi Wang <hsinyi@...omium.org>,
        Marek Szyprowski <m.szyprowski@...sung.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Jani Nikula <jani.nikula@...ux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@...ux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@...el.com>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Dave Airlie <airlied@...ux.ie>
Subject: Re: linux-next: build failure after merge of the i2c tree

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@...b.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@...b.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@...nel.org>

Kind regards,

   Wolfram


Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)