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 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 820FAC43334 for ; Mon, 11 Jul 2022 02:48:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD9F510F35C; Mon, 11 Jul 2022 02:47:52 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1371D10F35C; Mon, 11 Jul 2022 02:47:50 +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 4Lh7bM5bY4z4xMW; Mon, 11 Jul 2022 12:47:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1657507666; bh=ImZg73woeRL/6pJYSTs9jApSEo/CdR975e2jvaOLVSk=; h=Date:From:To:Cc:Subject:From; b=fVIrA5lf8Jjc0JLHFuXHhWhjplfV6WpoGvpjuY4pR5arVyrV1Nx1O6E9j+Z8VzwZA wxC79xuP7dL1TCYFSNoXWg5BFAnxtaSPt1dIVE5KPvmGWamJJl5m0qsm9btDmSwMq6 mWO2a0zl+dNIhvW/j5ks7ivxsyTYOAEOtt9mMfT0m6ZBtiPK+PuxbuqWWgpLb4TUgz u8kd8K1lIqe/YbBoeLNfqRdsxQl68xJ6TrEAOTOVRPF3TB7Jnp70/iwjRmVJn1uTvP JiqcUz0dzZPJlPESWSwtvMe75epdoJfPS6QAFkY0CObyF70Jg9vA0bONMkREPZMOKD inyAQFaLphd5g== Date: Mon, 11 Jul 2022 12:47:42 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20220711124742.3b151992@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/smMUJeGZzOH+aH15NIcQmOg"; protocol="application/pgp-signature"; micalg=pgp-sha256 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: Arunpravin Paneer Selvam , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Christian =?UTF-8?B?S8O2bmln?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --Sig_/smMUJeGZzOH+aH15NIcQmOg Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c between commit: 925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"") from the drm-misc-fixes tree and commit: 5e3f1e7729ec ("drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new") from the drm tree. This is a mess :-( I have just reverted the above revert before mergin the drm tree for today, please fix it up. --=20 Cheers, Stephen Rothwell --Sig_/smMUJeGZzOH+aH15NIcQmOg Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLLj04ACgkQAVBC80lX 0GxMzgf/dC6QJfFPofDeEzs9hvc5vhaw+egnc3apm1nrEP7M2pja0U46UZOLvMcA CoLNAKuA7CuJPEBNmxSDvWbKJlIczsEABFo40Kjv3bUFe0vImqctm/tV5gE0ejqp hAW8rswWpcNRNi3Rf2CHLtmkdAxynBX45+kPD63K1hmmWayeNE3tXEjZn4XWbcmb lieyknIODGyMA7LuDm3X9xQIzNo3FoaZ/q6OGlXVjARp/AseSdHnOf4jzoNkRjLo 1jONNlOkgndCvarZhqfrqTli3pRwMwU0ZS0KJdX4JAmB7Qz5ARiBhNDnam6n/get CO9ZX1k1LEA8bMhT03UVigg6Ac5ZHA== =j8bV -----END PGP SIGNATURE----- --Sig_/smMUJeGZzOH+aH15NIcQmOg--