Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 1 Jun 2021 10:32:50 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Wolfram Sang <wsa@the-dreams.de>,
        Chris Wilson <chris@chris-wilson.co.uk>
Cc:     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: linux-next: build failure after merge of the i2c tree
Message-ID: <20210601103250.07301254@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Ou=NQ8ZD7IfuNCXYZAlReGG";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Ou=NQ8ZD7IfuNCXYZAlReGG
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 f=
or '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/hib=
ernate")

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 funct=
ions

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/i9=
15/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);
 }
=20
-static int pm_prepare(struct drm_i915_private *i915)
+static int test_pm_prepare(struct drm_i915_private *i915)
 {
 	i915_gem_suspend(i915);
=20
 	return 0;
 }
=20
-static void pm_suspend(struct drm_i915_private *i915)
+static void test_pm_suspend(struct drm_i915_private *i915)
 {
 	intel_wakeref_t wakeref;
=20
@@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915)
 	}
 }
=20
-static void pm_hibernate(struct drm_i915_private *i915)
+static void test_pm_hibernate(struct drm_i915_private *i915)
 {
 	intel_wakeref_t wakeref;
=20
@@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
 	}
 }
=20
-static void pm_resume(struct drm_i915_private *i915)
+static void test_pm_resume(struct drm_i915_private *i915)
 {
 	intel_wakeref_t wakeref;
=20
@@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg)
 	if (err)
 		goto out;
=20
-	err =3D pm_prepare(i915);
+	err =3D test_pm_prepare(i915);
 	if (err)
 		goto out;
=20
-	pm_suspend(i915);
+	test_pm_suspend(i915);
=20
 	/* Here be dragons! Note that with S3RST any S3 may become S4! */
 	simulate_hibernate(i915);
=20
-	pm_resume(i915);
+	test_pm_resume(i915);
=20
 	err =3D switch_to_context(ctx);
 out:
@@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg)
 	if (err)
 		goto out;
=20
-	err =3D pm_prepare(i915);
+	err =3D test_pm_prepare(i915);
 	if (err)
 		goto out;
=20
-	pm_hibernate(i915);
+	test_pm_hibernate(i915);
=20
 	/* Here be dragons! */
 	simulate_hibernate(i915);
=20
-	pm_resume(i915);
+	test_pm_resume(i915);
=20
 	err =3D switch_to_context(ctx);
 out:
--=20
2.30.2

--=20
Cheers,
Stephen Rothwell

--Sig_/Ou=NQ8ZD7IfuNCXYZAlReGG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmC1gDIACgkQAVBC80lX
0GzH1gf/UGyYLcozbfcYhQ3Pz+8dBAL61LG9IcPII5mD27h4tAzXw0clnFYW/Esi
jqnG7bkrEyyyhWA/mr/4ESE5qVL9JTaNLjgdRMqsxDaOA6R9Mfqi4grbilKJseWb
q+b4CReChUYCm1JOAw2zwDhX+EV3X4UVSmua4yW1UCDm3UU6pDzJYyx7n1ZoiNRn
q4h2r6+B3zFHsFqnZMMjm+/Vrr3VobcpeeWDqc4S6CN5sPkWuYkvdCFQOJWRzD5x
ThivC1Sse6TDbUgFwQtWLg+NNV0LutWHnatyVcC1k6BCY03tChioJ3phFNMgl2ZB
1+iwOB13j9UmES0ArupFAYpPY3fkjQ==
=+chF
-----END PGP SIGNATURE-----

--Sig_/Ou=NQ8ZD7IfuNCXYZAlReGG--