From patchwork Tue Oct 27 01:20:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11859209 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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 02C00C56201 for ; Tue, 27 Oct 2020 01:20:50 +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 8A13F2080A for ; Tue, 27 Oct 2020 01:20:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="k4ErA3lx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A13F2080A 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BAA906EAB2; Tue, 27 Oct 2020 01:20:48 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE40B6EAB2; Tue, 27 Oct 2020 01:20:46 +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 4CKv620vqKz9sSW; Tue, 27 Oct 2020 12:20:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1603761644; bh=JqnLPt5PpfQpxYmHkHTWZuecwdhM0kzTZE1MAPG/y7Y=; h=Date:From:To:Cc:Subject:From; b=k4ErA3lx1Lx+J0XM9vO/Jkga9PpYn1tcocS9S+XvXhR388VChiDu6ddX2SRF/9JXh TG86XEvSoJARW52KphQImj2POMgiVXrvwzgSLk+ztOicOGWOVwxRjiPgZtEbPjORmn cdhULGMF+CidADASxUHoCDE3MfXcBzEtftL1WhnDpcLoIrB922RJIjRt5lNShyEghb Jjx8FB/3kcl1pCzIywF1AvtzDfXQD1wviz3WpgQVfj4ajODS/s9D5XdFStjGh/YO9/ 2JjKqPbWq/MkCR8E5hNpo42npMWTeb7jpwxUIxEczxLjg4XfuwAjHrBVETN4USY5BN KfrjqiduIrBYQ== Date: Tue, 27 Oct 2020 12:20:41 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20201027122041.021ab60e@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: Rob Clark , Dave Airlie , Linux Next Mailing List , Linux Kernel Mailing List , Maxime Ripard 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: drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c between commit: e12e5263bf1d ("drm/msm/dpu: clean up some impossibilities") from Linus' tree and commit: 351f950db4ab ("drm/atomic: Pass the full state to CRTC atomic enable/disable") 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/msm/disp/dpu1/dpu_crtc.c index f56414a06ec4,5ba9b49dfa7a..000000000000 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c