From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E8F7C433FE for ; Fri, 11 Feb 2022 02:06:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347143AbiBKCGd (ORCPT ); Thu, 10 Feb 2022 21:06:33 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:60084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242403AbiBKCGd (ORCPT ); Thu, 10 Feb 2022 21:06:33 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 459155F9B; Thu, 10 Feb 2022 18:06:32 -0800 (PST) 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 Cc: Arunpravin , Christian =?UTF-8?B?S8O2?= =?UTF-8?B?bmln?= , Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20220211130623.7cb860aa@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/j4imPgn6DGpQHHJIoh5bmez"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/j4imPgn6DGpQHHJIoh5bmez Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_module.c index 8451822637f0,5d6fdf37fb5a..000000000000 --- a/drivers/gpu/drm/i915/i915_module.c +++ b/drivers/gpu/drm/i915/i915_module.c @@@ -9,6 -9,8 +9,7 @@@ #include "gem/i915_gem_context.h" #include "gem/i915_gem_object.h" #include "i915_active.h" -#include "i915_buddy.h" + #include "i915_driver.h" #include "i915_params.h" #include "i915_pci.h" #include "i915_perf.h" --Sig_/j4imPgn6DGpQHHJIoh5bmez Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIFxJ8ACgkQAVBC80lX 0Gwl9wgAkS+R5m4vZdQSOT5buQhA9ewL+7ldHjHps/dIAd34h78CLE1DYkjKFKm+ 6RcCKONnjNtXpOjWq0pNCwE4rv0TezHci5wDKspow9yXQ7heqGk+508KLiyJrYAK rKB884EyrdPe5kN5e1T3G/YzVtYhInusN37jhGMDksTvegNo3Txtdr4vhMtkImY0 0TpnY3lgK8RkMoGCitAvYRp4D90Sgltjt9GDw5y0vs9fx8JwhU/LkP2J9iOws5bE UsffZqZZfb3a7gle3ahQOhsHTj9wwE+GpcW7ehWtwSoX05qPoAq6ItA5wUDBTSeh RJ0JAYo12wD7vsILwIFJHf1c2bH98g== =z61v -----END PGP SIGNATURE----- --Sig_/j4imPgn6DGpQHHJIoh5bmez--