From: Hsin-Yi Wang <hsinyi@chromium.org> To: Wolfram Sang <wsa@the-dreams.de>, Stephen Rothwell <sfr@canb.auug.org.au>, 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 17:09:37 +0800 [thread overview] Message-ID: <CAJMQK-j1YKfquvY55HgTQ6zfDkE5btmRZKdjjOQ3rcq04QgKKQ@mail.gmail.com> (raw) In-Reply-To: <YLX176D9oD7ZTSkT@ninjato> On Tue, Jun 1, 2021 at 4:55 PM Wolfram Sang <wsa@the-dreams.de> wrote: > > 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! > Hi, this issue is fixed in https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45 And I think the pull request is in https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html Thanks > > > 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 >
WARNING: multiple messages have this Message-ID (diff)
From: Hsin-Yi Wang <hsinyi@chromium.org> To: Wolfram Sang <wsa@the-dreams.de>, Stephen Rothwell <sfr@canb.auug.org.au>, 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: [Intel-gfx] linux-next: build failure after merge of the i2c tree Date: Tue, 1 Jun 2021 17:09:37 +0800 [thread overview] Message-ID: <CAJMQK-j1YKfquvY55HgTQ6zfDkE5btmRZKdjjOQ3rcq04QgKKQ@mail.gmail.com> (raw) In-Reply-To: <YLX176D9oD7ZTSkT@ninjato> On Tue, Jun 1, 2021 at 4:55 PM Wolfram Sang <wsa@the-dreams.de> wrote: > > 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! > Hi, this issue is fixed in https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45 And I think the pull request is in https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html Thanks > > > 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 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-06-01 9:10 UTC|newest] Thread overview: 38+ 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 0:32 ` [Intel-gfx] " Stephen Rothwell 2021-06-01 0:32 ` Stephen Rothwell 2021-06-01 0:35 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork 2021-06-01 8:55 ` Wolfram Sang 2021-06-01 8:55 ` [Intel-gfx] " Wolfram Sang 2021-06-01 8:55 ` Wolfram Sang 2021-06-01 9:09 ` Hsin-Yi Wang [this message] 2021-06-01 9:09 ` [Intel-gfx] " Hsin-Yi Wang 2021-06-01 9:09 ` Hsin-Yi Wang 2021-06-01 9:21 ` Wolfram Sang 2021-06-01 9:21 ` [Intel-gfx] " Wolfram Sang 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=CAJMQK-j1YKfquvY55HgTQ6zfDkE5btmRZKdjjOQ3rcq04QgKKQ@mail.gmail.com \ --to=hsinyi@chromium.org \ --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=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 \ --cc=wsa@the-dreams.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.