From patchwork Thu Nov 17 02:13:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13046030 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 21F79C433FE for ; Thu, 17 Nov 2022 02:13:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EDBE10E51B; Thu, 17 Nov 2022 02:13:26 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C8F910E51B for ; Thu, 17 Nov 2022 02:13:21 +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 4NCNk33kBPz4wgv; Thu, 17 Nov 2022 13:13:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668651196; bh=0JvtbpFAWrozBSyXHaFd/9u1ToyjkJvQTSHxuUq3Bdw=; h=Date:From:To:Cc:Subject:From; b=TDn3pSd6Nh4nu23XHdcPEybqNyJZOFMO+s5Lq79WQMOvvUKeJWQtZLhOVnYs+I5am BdxWao9AvB22w2p40tLGoDu1Afg2lKnVVKo0Wz+ockZ5VZfvKR3RbJrAwrQSPv8kff ADV/Z+lr/X+VXuVbLtzLxgf6+Q7d7GoX0ukmWuH5hZc2cUdJkrQL/h7eGKIW7Clwgx 2+d2zMnkA6nw378lYjoLmPFhHiLkY/myQ3ArLHJGvwyitGLQiDmeIXTTaj76+TjqJk 8A4ckpuA6mjQ9nit8ejCtTIYL71MTWxJkR8pZLM4Kj9EL7utdw94HyqDT5xMQPh2B5 gA/tDJvRmj/eg== Date: Thu, 17 Nov 2022 13:13:13 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20221117131313.22294c0c@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: Biju Das , Linux Next Mailing List , Laurent Pinchart , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/rcar-du/Kconfig between commit: a830a1567859 ("drm: rcar-du: Fix Kconfig dependency between RCAR_DU and RCAR_MIPI_DSI") from Linus' tree and commit: 7a043f978ed1 ("drm: rcar-du: Add RZ/G2L DSI driver") from the drm 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/rcar-du/Kconfig index fd2c2eaee26b,f14686549cbe..000000000000 --- a/drivers/gpu/drm/rcar-du/Kconfig