From patchwork Thu Apr 1 02:13:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12176879 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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 19865C433B4 for ; Thu, 1 Apr 2021 02:13:57 +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 A584C61006 for ; Thu, 1 Apr 2021 02:13:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A584C61006 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 0BDC86E07D; Thu, 1 Apr 2021 02:13:55 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 451946E07D; Thu, 1 Apr 2021 02:13:52 +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 4F9mvJ6zshz9sVt; Thu, 1 Apr 2021 13:13:48 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1617243231; bh=DN2c7zg0o8Dw4cOnwZThU1cjsLPDtkhUjdXr14ceT8A=; h=Date:From:To:Cc:Subject:From; b=Kdz8/Hu1tGHDnb+crfrKLuuXUO/p0OsiD33YJAQHictxKtB6kw3BTmvanOLsTouW6 3rZ+1HS9JPTHJYzDs2tkGnNE8YzvAGJ6ZcSp+H2LXEqGT4A4qQ/oFgEpq/88dCuSJU 7nH8Q6Y7uf8AvpxzgAW59zJy+upp6zreSrXqvjcbKkZU7Lls5j7CkFM1MGEUHIyfMa q9p8iFUT1wmS9f5C9w4J7+oWLquKIAkO4mosyCGJi7PqtDlPTbb+r2osk3vp4CB9sp xFJXW1Yt5nxJNIcfk8TaFH+HnEA7zDnlnTfVK0k3fx6Gi1a/H5AmFaA8RpA5ns1t2f Y10m64O6hC07A== Date: Thu, 1 Apr 2021 13:13:46 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , Dave Airlie , DRI Subject: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20210401131346.0d522e75@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: Linux Next Mailing List , 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-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_display.c between commit: 1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane") from the drm tree and commit: 61169987c4d9 ("drm/i915: Unify the FB and plane state view information into one struct") 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. diff --cc drivers/gpu/drm/i915/display/intel_display.c index aa524eff20e1,bdb2adb4d748..000000000000 --- a/drivers/gpu/drm/i915/display/intel_display.c