From patchwork Fri Feb 11 02:06:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12742684 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 6DE2EC4332F for ; Fri, 11 Feb 2022 02:06:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B94110E9B0; Fri, 11 Feb 2022 02:06:34 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 96F0B10E9A6; Fri, 11 Feb 2022 02:06:32 +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 4Jvxmx3R5xz4xRB; Fri, 11 Feb 2022 13:06:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1644545187; bh=41ADKpDhvwyAZMddYDgXJPz5v6qbPxB/ugfUN4tyqPY=; h=Date:From:To:Cc:Subject:From; b=UJW2EGP2gLjAh/cRmfLgwqpw8uDQuFU/YD2O0G/D7rZjQ1WxozYtv/kbL3fNn1uEI 9X5S71wRvgTEI06My5CPP9546gXgwSUV21RiZPXdUdc2CoL30VN/XJ66sYY/YWb1D7 m1w+SHNMs45frFiYfkXCSs3JcaFyw5eJu4ZB6bZiuKkp+vIHftlJOircnOhlqhbuXB PCnkoDWiGNXHzQRH09DK79aXdNoNfeKspBbfi5cc0qWy9oCcIa3Tgn7f2hv522LCHr +IUcKfZmCR0Tgh6fBd3pEESjf9LWTs5PE5/KbnaXYE931xOP4wE5waq6EN3S9UONsb UyenXucDeN8KA== Date: Fri, 11 Feb 2022 13:06:23 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Dave Airlie Message-ID: <20220211130623.7cb860aa@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List , Christian =?utf-8?b?S8O2bmln?= , Arunpravin Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_module.c between commit: 6387a3c4b0c4 ("drm: move the buddy allocator from i915 into common drm") from the drm tree and commit: 24524e3f43cf ("drm/i915: move the DRIVER_* macros to i915_driver.[ch]") 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/i915_module.c index 8451822637f0,5d6fdf37fb5a..000000000000 --- a/drivers/gpu/drm/i915/i915_module.c