From patchwork Fri Apr 12 06:42:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10897303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D04651390 for ; Fri, 12 Apr 2019 06:43:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1C9028E3D for ; Fri, 12 Apr 2019 06:43:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A552328E49; Fri, 12 Apr 2019 06:43:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5190F28E3D for ; Fri, 12 Apr 2019 06:43:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F9BB8989A; Fri, 12 Apr 2019 06:43:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2E198989A for ; Fri, 12 Apr 2019 06:43:04 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Apr 2019 23:42:58 -0700 X-IronPort-AV: E=Sophos;i="5.60,340,1549958400"; d="scan'208";a="135150521" Received: from jkrzyszt-desk.igk.intel.com (HELO jkrzyszt-desk.ger.corp.intel.com) ([172.22.244.18]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 11 Apr 2019 23:42:54 -0700 From: Janusz Krzysztofik To: Dave Airlie Subject: [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution Date: Fri, 12 Apr 2019 08:42:49 +0200 Message-ID: <2173849.8TjdhqGAES@jkrzyszt-desk.ger.corp.intel.com> Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , Jani Nikula , dri-devel@lists.freedesktop.org, Lucas De Marchi , =?iso-8859-1?q?Jos=E9?= Roberto de Souza , Daniel Vetter , Sean Paul , Gerd Hoffmann , Rodrigo Vivi , Janusz Krzysztofik , Thierry Reding , Daniel Stone Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP A change introduced by commit ba3bf37e150a ("drm/drv: drm_dev_unplug(): Move out drm_dev_put() call") to drivers/gpu/drm/drm_drv.c has been reverted by that incorrect merge conflict resolution, fix it. That has been apparently introduced into the rerere-cache branch by commit dc780f3f8eb4 ("2019y-03m-25d-06h-59m-12s UTC: drm-tip rerere cache update"). Fixes: dc780f3f8eb4 ("2019y-03m-25d-06h-59m-12s UTC: drm-tip rerere cache update") Signed-off-by: Janusz Krzysztofik --- rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage | 1 - 1 file changed, 1 deletion(-) diff --git a/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage b/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage index e87799e3e7ff..50d849d1bc6e 100644 --- a/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage +++ b/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage @@ -508,7 +508,6 @@ void drm_dev_unplug(struct drm_device *dev) synchronize_srcu(&drm_unplug_srcu); drm_dev_unregister(dev); - drm_dev_put(dev); } EXPORT_SYMBOL(drm_dev_unplug);