From patchwork Tue Oct 17 08:18:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 116029 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4595724qgn; Tue, 17 Oct 2017 01:19:19 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCflywwRPYjt7jA7/Mj2sjb2fTSBJ/EpxeLQXew9VBEcb5GL8FM0OGjRmNJoiCO6akbkxxc X-Received: by 10.159.247.199 with SMTP id v7mr11060647plz.321.1508228359640; Tue, 17 Oct 2017 01:19:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508228359; cv=none; d=google.com; s=arc-20160816; b=z6wNLd6TuZ6TXS7LIj6pEsQmX72lZ9GVT0OsFTh/AsoQ9nvXA1C6gLRE8d3udrwU6n 54wOxH7/WARaRxWp8JAObCsE0IUV0adsw/DX8L6HFS1XsRfuHSBB28RmP7+9t3BXxtNW Ud5bV6BbA2yjZ1h6BlPcETiOqLiFDK3ksBjUOTpKZWDXdKZ0724wR2fPu5vTtjlLyQUR qtZwSaEtEky1D9nCXKnKZQ84e9fJt02aj3G4cxFg0Ld7Kk9wBYeFDSk9YN5qNti4HL0V 2hgMjc1Gi6Mb1djLEbYnmEbjkbDgVPikeEt6sFGbxHdbiptMtudn74VAKeVuk/MPlETb R+BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=uTKO7hDKrq7sr/hib+fTIPu0QuSLHw0FyexCcJSA4E8=; b=GA1MgWW+09e21/Wy8wkI9evAHyN4OQljC5rmD5yi4P9XaYa2Eo1YEXbeEyw1qQTAA4 CjpeYrUTZx+DROcOI+yQarej3WynqaYdF6w0tc3+q7R5DMtYGSunyC+jK1rPVXlbZkuK e6z3qvwPf4rzj5KgzUicuP0CKHJTAMk43a7478/i9rKUp66rb9IJ3Ls/ZTXqhDmN3u+J aD06/kskVEkAbsVLS/oekTGqE5f1VJ5ytEVkBiY4ZZPITOVj71NSK9ewyPe/vNEt01RA RzLcFYhrCeFg1TZWJOGK+YcUYFDHxSc+9jgb9nrXzJynTUAXXzvJ27T1cOHkcOKyi7tH QkIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g25si5206953pge.83.2017.10.17.01.19.19; Tue, 17 Oct 2017 01:19:19 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759399AbdJQITR (ORCPT + 27 others); 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 Received: from wuerfel.lan ([46.223.139.202]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MVd8x-1djkri11Qt-00Ywnr; Tue, 17 Oct 2017 10:18:37 +0200 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 Precedence: bulk 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(+) -- 2.9.0 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);