From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree
Date: Tue, 1 Feb 2022 09:08:59 +0000 [thread overview]
Message-ID: <c2e873de-9031-ea80-acd6-45ef53000635@linux.intel.com> (raw)
In-Reply-To: <20220201092735.1d5b38d3@canb.auug.org.au>
On 31/01/2022 22:27, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/i915/i915_vma.c: In function 'i915_vma_bind':
> drivers/gpu/drm/i915/i915_vma.c:451:25: error: 'ret' undeclared (first use in this function); did you mean 'net'?
> 451 | ret = i915_gem_object_wait_moving_fence(vma->obj, true);
> | ^~~
> | net
>
> Caused by commit
>
> 2e872d87cbf2 ("drm/i915: delete shadow "ret" variable")
>
> I have reverted that commit for today.
Dropping was the right call - I have since removed it from
drm-intel-fixes as well.
Root cause was a bad Fixes: tag in that patch which caused it to be
wrongly cherry-picked and I did not build test before pushing.
We can't edit the wrong Fixes: tag now, so for future reference only,
2e872d87cbf2 ("drm/i915: delete shadow "ret" variable") should not be
backported to 5.17 by anyone.
Wrong tag:
Fixes: f6c466b84cfa ("drm/i915: Add support for moving fence waiting")
Correct tag should have been:
Fixes: 2f6b90da9192 ("drm/i915: Use vma resources for async unbinding")
Regards,
Tvrtko
next prev parent reply other threads:[~2022-02-01 9:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-31 22:27 [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree Stephen Rothwell
2022-02-01 9:08 ` Tvrtko Ursulin [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-13 12:14 Stephen Rothwell
2020-11-03 22:37 Stephen Rothwell
2020-11-04 0:25 ` Rodrigo Vivi
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=c2e873de-9031-ea80-acd6-45ef53000635@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=dan.carpenter@oracle.com \
--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=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