From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759398AbdJQITR (ORCPT ); Tue, 17 Oct 2017 04:19:17 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:53821 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759295AbdJQISz (ORCPT ); Tue, 17 Oct 2017 04:18:55 -0400 From: Arnd Bergmann To: broonie@kernel.org Cc: akpm@linux-foundation.org, Arnd Bergmann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Chris Wilson , Tvrtko Ursulin , Mika Kuoppala , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] linux-next: drm/i916: fix nop_submit_request mismerge Date: Tue, 17 Oct 2017 10:18:25 +0200 Message-Id: <20171017081835.3792306-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:izAbUn/E96ZNhF1peX60SbCR9s5su/AB970SxKFRrq8qTp4dKHx nkIrNlzQSFqMUVsMsd4oOyNpX9ojUvxCbl2i74PYNTgV0IOwiwji77mDHyChIMcGpJZS/c/ li9hx/mvOsxsnUwoYs/bYqmvykGu8YYy0NTg3QmKYG6uwSOlzF4ubO4picThIvpdwuDcNPZ hFaTJyy01ijhnFXFrukWg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Mur7LZUpsoU=:F3qtqXwphmjbP48zUIyG25 6WcAVnD+6zgDeM4o5XJrWacfZ5SGWvwZXsiBq/UaadJFnZWXWSwum2aKd3OMiAWfeIq0C0npu NsaCtPN7p5/u+7cuFEQ/LO7KcxrAA2cK/n7eYQeQOSeL0MaR7V3WA/cJpQtDlP3QRp/ptsRW7 LtWcNF2OD/FAhHm1HwhN7kRQAExADbBS9zMMBVrqlhbcuKbtHLdLdLJ/yJJxDfzf5I4dtfa1+ wRKARQjYSn6KRLIAlwqAdEDgZvU1rc0WO/jIyRO12A61C5yFxzvDRkx5nqdpY/XC/kPfMIQcX 4XxfckxEfL8e4aPbsOaBUdk1ssf1uH60Ukt0wG9vuvPRBKzjPT7ijTXPNgSMOF0jUxsUxcA3C H53tyWHdQrjGo0y1SCWTR3A4d4MHcw2M/EtwjMJhNh/kJ//quiojnUYTvC+EzgkuaSqXnf7Lj BQB4yOMtTLGx6mOLBNJMXXIWLivemOTwkQJ0U8DIyxm1YkP5FOlbok1qJ0gTO4+YAz25HMaeP oAXVFc8hzVI6ZfTHv3Yv443gpZEXF998bmHTGhnjGDK5zCYT6nBU38X1X/vDVaKJ01sQycBeD S2XB5Et0LmxWRUpoa7Sza6HRmrB3HHxFVtPzxa0C/XWb3TlJHkOTP5gSlgkjuEBdPrvIz77aY dsDyM+Jr2je8nx8X5nS8y6S2GuMkdKnyADyW1OQev5D5fDRQk27lTyjW7KtP5CDgMsI4o7rPJ b9688FMKTd9L4V2MRFuvuyBEwbUWED+Q+i8tkw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A mismerge in linux-next caused a build failure: drivers/gpu/drm/i915/i915_gem.c: In function 'nop_submit_request': drivers/gpu/drm/i915/i915_gem.c:3092:54: error: 'flags' undeclared (first use in this function); did you mean 'class'? This is the fixup I used to get a clean build on top of today's tree. I don't know which of the versions is the one we want, so this may just as well be wrong. Fixes: 05724bd054c3 ("Merge branch 'akpm/master'") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b4b62f427a99..ee2aee869dc6 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3087,6 +3087,8 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv) static void nop_submit_request(struct drm_i915_gem_request *request) { + unsigned long flags; + dma_fence_set_error(&request->fence, -EIO); spin_lock_irqsave(&request->engine->timeline->lock, flags); -- 2.9.0