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

Stephen Rothwell
2019-11-27T23:39:09Z

[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]

Hi all,

On Wed, 6 Nov 2019 13:53:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Thu, 10 Oct 2019 13:14:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I added the following merge fix patch for today:
> >
>
> This patch is now just:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 10 Oct 2019 13:08:43 +1100
> Subject: [PATCH] drm/i915: update for mutex_release API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/i915/i915_active.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
> index aa37c07004b9..a47387174434 100644
> --- a/drivers/gpu/drm/i915/i915_active.c
> +++ b/drivers/gpu/drm/i915/i915_active.c
> @@ -385,7 +385,7 @@ void i915_active_set_exclusive(struct i915_active *ref, struct dma_fence *f)
> mutex_acquire(&ref->mutex.dep_map, 0, 0, _THIS_IP_);
> if (!__i915_active_fence_set(&ref->excl, f))
> atomic_inc(&ref->count);
> - mutex_release(&ref->mutex.dep_map, 0, _THIS_IP_);
> + mutex_release(&ref->mutex.dep_map, _THIS_IP_);
> }
>
> bool i915_active_acquire_if_busy(struct i915_active *ref)
> --
> 2.23.0

This merge fix patch is now needed for the merge between the drm tree
and Linus' tree.

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]