From patchwork Wed Oct 5 00:43:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12998807 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 069DCC433F5 for ; Wed, 5 Oct 2022 00:43:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5345310E417; Wed, 5 Oct 2022 00:43:17 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10B3610E078; Wed, 5 Oct 2022 00:43:11 +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 4Mhwls35XYz4wgv; Wed, 5 Oct 2022 11:43:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1664930586; bh=u3+7g8/NTQ+C/yLguEF4M8kLu7VY03qew1r8TYkvPPA=; h=Date:From:To:Cc:Subject:From; b=oBhrBU/3DRwuDLjK5j0hbncOUx9U10IYEQMQzYxE2hDdCsF6Zcb52Y9oY/kfPEy3c r69oi4wYEDAcJeD+x3hWlCpkJkiYPsAR0GgnS7dXqqBXQSWAOX4P8uoaAWD/TaEebC GHZV9OJvIKvBM7rk6AGkssVa+NsrGkrsZTLMMFo3sM80zFGlI4vVXt/toLEEKwFLRL 34bjkGHVyljwh4W0D/WgDYeZ8uHxoG0edkEHcsgCpNEzVhrGVIVci4cyMOp3G1ZM+p 7DyFdtoL82uyV6khe8HYOLTOGKlYzeQojRuHDDtqzg6/odpwTaPGNpMTGBCgqoYC6O hH0OlSvqJzEzA== Date: Wed, 5 Oct 2022 11:43:03 +1100 From: Stephen Rothwell To: Daniel Vetter Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20221005114303.0e4b0881@canb.auug.org.au> 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: , Cc: Intel Graphics , Linux Next Mailing List , Linux Kernel Mailing List , DRI Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drm_edid.h between commit: c7943bb324e5 ("drm/edid: Handle EDID 1.4 range descriptor h/vfreq offsets") from Linus' tree and commit: afd4429eba28 ("drm/edid: Define more flags") 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 include/drm/drm_edid.h index 1ed61e2b30a4,28dd80343afa..000000000000 --- a/include/drm/drm_edid.h