Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 6 Nov 2019 13:53:40 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Dave Airlie <airlied@linux.ie>,
        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>,
        Chris Wilson <chris@chris-wilson.co.uk>, Qian Cai <cai@lca.pw>
Subject: Re: linux-next: build failure after merge of the tip tree
Message-ID: <20191106135340.3fa45898@canb.auug.org.au>
In-Reply-To: <20191010131448.482da2b2@canb.auug.org.au>
References: <20191010131448.482da2b2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/VW6llrPudTqo2dW_VBOacYv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

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:
>=20

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_);
 }
=20
 bool i915_active_acquire_if_busy(struct i915_active *ref)
--=20
2.23.0

--=20
Cheers,
Stephen Rothwell

--Sig_/VW6llrPudTqo2dW_VBOacYv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3CNbQACgkQAVBC80lX
0GxdjQf/S0M3ryc3d9GRdi7jkkq0TiF/zlwiiwtKRaVqw6Gi+j0f7blRZRKizSZr
E9PfyIhmbl+PKyCs+LvhDxG7cDDh6zdqIzVKtjBMvlldty7Z73EKvwmX8LEjpGf9
VkXcxqCGnhQxpAQaJpxzYq6x+Vx26Ubr6LJ5B4ilChMbfTTz2qkIQJ8ARw+LR7+p
RfZYnGxGDMsPSeLy15AJhzUXwFDL/zaotzkWvAXCF/JMr0l9rTKeZNRUXPvxeF9J
hgU3az9xjnfkXqsV7+IKUdm0R8zUnHhyGm4AcBGWqHz2xOnYUkNxQQudMTc8aXQv
HVzUxnHBsNZ2B7LpfFWCAzXUgPo+Bg==
=nrAt
-----END PGP SIGNATURE-----

--Sig_/VW6llrPudTqo2dW_VBOacYv--