From patchwork Thu Oct 28 02:48:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12589151 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 DC8DBC43217 for ; Thu, 28 Oct 2021 02:48:11 +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 890F2610FC for ; Thu, 28 Oct 2021 02:48:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 890F2610FC 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 C06A86E584; Thu, 28 Oct 2021 02:48:08 +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 94C356E581; Thu, 28 Oct 2021 02:48:07 +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 4Hfqjw41TSz4xcC; Thu, 28 Oct 2021 13:48:03 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1635389285; bh=98LBQjd8SWx4eW7nPK8+c9joxFzfiz5GTPiWTgydAcs=; h=Date:From:To:Cc:Subject:From; b=BXwKl3YwpQqZPI9CUL6DwHMG9qVb3m8ooBZ/0i1DP5inGI0Qj3yPqpJNY8HdD1gm1 SvxFlsDs05DjO+alxmz7LDBB4mC9/Ei7Xhts9LIAM06QJYs5OpQ//MnqCPSFaPzIrU lAIBjq4SsjG2UULppdDtfdSnObUILS+L96wV7JfDDiv0UQp0m7id3VpuPJHlL7Pfu0 SLCBGZW7gg0Wv4PFhBI7iZGQ/jDNCs6McwaIDCLJMreY+Qv5QfbftvS3BSJYOGFaJQ 1D1zJ6MFIv9NP0wyw92Q5OyVRkKK/gdI+nMHr/QPqgCqHXfRA8J/hrzfGCQRSCpfwc lz4mWzHmTrVzg== Date: Thu, 28 Oct 2021 13:48:02 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Anitha Chrisanthus , Edmund Dea , Linux Kernel Mailing List , Linux Next Mailing List , Maarten Lankhorst Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20211028134802.5740588b@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: , 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/kmb/kmb_drv.c between commit: c026565fe9be ("drm/kmb: Enable alpha blended second plane") from Linus' tree and commit: 099afadc533f ("drm/kmb: Enable support for framebuffer console") 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/kmb/kmb_drv.c index 961ac6fb5fcf,7e1fda9f9a3d..000000000000 --- a/drivers/gpu/drm/kmb/kmb_drv.c