From patchwork Mon Aug 2 15:29:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12414287 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6345DC4320A for ; Mon, 2 Aug 2021 15:35:21 +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 294E5610A8 for ; Mon, 2 Aug 2021 15:35:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 294E5610A8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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 9E5B26E202; Mon, 2 Aug 2021 15:35:20 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 844606E202; Mon, 2 Aug 2021 15:35:19 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id CFC62610A8; Mon, 2 Aug 2021 15:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627918519; bh=uaD6LcM0hJBb/L3SNeTefSKZ9bj7Ix5GN0yWEUA3Bfw=; h=From:To:Cc:Subject:Date:From; b=ncpAGccp0N5gsmshPd3iL+fAuTMfexkRiO3lwsMMzwU0P8c4h7+aWZF0WlinTQk5T GoEesBFUGoxQQNDixa8ZDGH5J5NKVfqfpa60Gyvd7AIzHHvKsn5dYMMc1fLuELxE0L IGhDpbKIXQh4KVOn/aMxzt7KOkttXBO2+w8wjYpuJgFS8IMJ+1I6JllU+4pni1DzNC 6iCiyzUjMkWJaohyTysFwr0LWbf/DWRnlwuAYQqx9NMRPwv5fP26Ryzp7vEBEDpz0W R6WgFVfJeLHECCKDci3p/K30166MCHZyXVeR02zHgjqnzEvADmhCUHURZbNf1xxB0c J0gAumDkfWnYg== From: Mark Brown To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Lucas De Marchi Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Date: Mon, 2 Aug 2021 16:29:49 +0100 Message-Id: <20210802152949.15965-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_display.c between commit: b4bde5554f70 ("drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs()") from Linus' tree and commits: cad83b405fe4 ("drm/i915/display: remove PORT_F workaround for CNL") ec387b8ff8d7 ("drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs()") from the drm-intel 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. +++ b/drivers/gpu/drm/i915/display/intel_display.c diff --cc drivers/gpu/drm/i915/display/intel_display.c index 557871ee07db,3faedcb7ef42..000000000000 --- a/drivers/gpu/drm/i915/display/intel_display.c