From patchwork Tue Nov 16 22:29:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12623253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 863C8C433EF for ; Tue, 16 Nov 2021 22:30:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2300563215 for ; Tue, 16 Nov 2021 22:30:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2300563215 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A7D4989F97; Tue, 16 Nov 2021 22:30:07 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee2:21ea]) by gabe.freedesktop.org (Postfix) with ESMTPS id B01E289F92; Tue, 16 Nov 2021 22:30:05 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Hv12w0kRMz4xbP; Wed, 17 Nov 2021 09:29:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1637101800; bh=Xw7trDkD7uY90Smie1IcmfEkVeFAgUDQ41gh0T+Nw/U=; h=Date:From:To:Cc:Subject:From; b=EA7JT3mSR14XgUMj2/qGbJ91bAdcHdTPP11x2oaU/IGmmstuybWDFG9jwALFxiEt7 59MibmHOJyO3j8bgiqtqWdLu6bJ9GjJ9HuvZAnixDkT001IGjWZkIZPutTMbYHRiN+ GtTk0+sufe1wXE6cPdY9vzlAsgcq12B9KB/IWyVrUHs1cR3DoJxwoXr0P18m+C8d8e QyaduGC8HyS9916dyEHGMHjrhxqRgZlcbKhu0SYGZxmogIcZf41iNpcNjZhlAiNRmf HxawsQEWUNw/EOlHLoy8X079GjmWQMs1+2TVs0xtdV5ns6R9RDzKKcEpT8SBUvyfao 131Enj600ZtqA== Date: Wed, 17 Nov 2021 09:29:57 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20211117092957.5f2daa9e@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karol Herbst , Luo Jiaxing , Linux Kernel Mailing List , Fangzhi Zuo , Linux Next Mailing List , Ben Skeggs , Bhawanpreet Lakha Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/nouveau/dispnv50/disp.c between commit: d6c6a76f80a1 ("drm: Update MST First Link Slot Information Based on Encoding Format") from Linus' tree and commit: 606be062c2e5 ("drm/nouveau/kms/nv50-: Remove several set but not used variables "ret" in disp.c") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c index 8e28403ea9b1,23fa9ecc2296..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c