linux-kernel - Re: linux-next: build failure after merge of the tip 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] [day] [month] [year] [list]

Message-ID: <20191128103902.658e2a14@canb.auug.org.au>
Date:   Thu, 28 Nov 2019 10:39:02 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>
Cc:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Chris Wilson <chris@...is-wilson.co.uk>, Qian Cai <cai@....pw>,
        Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: build failure after merge of the tip tree

Hi all,

On Wed, 6 Nov 2019 13:53:40 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
> 
> On Thu, 10 Oct 2019 13:14:48 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > I added the following merge fix patch for today:
> >   
> 
> This patch is now just:
> 
> From: Stephen Rothwell <sfr@...b.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@...b.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

Content of type "application/pgp-signature" skipped