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 B3893C433EF for ; Sun, 17 Jul 2022 23:45:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231146AbiGQXpI (ORCPT ); Sun, 17 Jul 2022 19:45:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbiGQXpH (ORCPT ); Sun, 17 Jul 2022 19:45:07 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37DD4FD1D; Sun, 17 Jul 2022 16:45:05 -0700 (PDT) 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 4LmMCB63PXz4xhn; Mon, 18 Jul 2022 09:44:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1658101499; bh=kQL7s0bv0QVHOf6xNkEQ6iRj458x4B3GPPXuqjZxsDI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=G9/V5bsYQdzT8lFlBqsJgYbE3dK4DCoDdyXL2f6eaU6ntUfOygHABeUCbQbW4QNUD wvSgw9eBM2hJaduED9ml1DITLUHnMrlPZ6rDi53PPtGA6rb5bT9V/p1R4n+gdlzOPj fwWM0GexHRPyUYE0QCQO/p3vlnYhbQNMoBWYYpVGuZWrhAdBVLOHcIs/+LRKMzle0y lIW8O9r0Xt2vDy7aWDXS25JPjOfvBwqwi6b995CNhmqN8wfYhAnIPx7UlpfeZzExX2 jbs+QbU8PsOIU5jgfKnEslfl3UDxvcLcIujcIOQDLpdqy7ZS7+BaiyBGdz8XXvSbkI pKKzU/b4E1Jpg== Date: Mon, 18 Jul 2022 09:44:53 +1000 From: Stephen Rothwell To: Dave Airlie Cc: Christian =?UTF-8?B?S8O2bmln?= , Daniel Vetter , Intel Graphics , DRI , Arunpravin Paneer Selvam , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20220718094453.2f1a1f09@canb.auug.org.au> In-Reply-To: <6e60d396-2a52-d1fa-f125-3c585605b531@amd.com> References: <20220711124742.3b151992@canb.auug.org.au> <6e60d396-2a52-d1fa-f125-3c585605b531@amd.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/8YejglQrq3zPUgCrXSL0TSk"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/8YejglQrq3zPUgCrXSL0TSk Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 11 Jul 2022 10:05:45 +0200 Christian K=C3=B6nig wrote: > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell: > > > > 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 >=20 > Sorry for the noise, the patch "5e3f1e7729ec ("drm/amdgpu: fix start > calculation in amdgpu_vram_mgr_new")" and another one is going to be > reverted from the drm tree as well. >=20 > It's just that -fixes patches where faster than -next patches. Here we are a week later, -rc7 has been released and as far as I can tell (though I may have missed it), this is still a problem :-( I am still reverting 925b6e59138c (which is now in Linus' tree). --=20 Cheers, Stephen Rothwell --Sig_/8YejglQrq3zPUgCrXSL0TSk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLUnvUACgkQAVBC80lX 0Gw6agf9GW4WNGxB7WRUxFOdrFlVRBxgU93UbVTP5tRDPx9AiZiDEOVvGTI6/QlL z8HL2oxR4QCqQBI3JeY+jGbOY/0DCn2OwtaKe1bTCYtdNbprgZxeTi4/x7dru2V9 Db8ypw5hqiNrXsLSE+RR+t2joQj3jkmnvNK4PXM78LyuXkt31TbrkBCU/vVtVjp6 xcnIlDP2jtiuPAbh1EZf/fPG3/fYKid+g35eSDLV2Y4gc0/CNUuP+D9dh4DaLAzW bBOEa40Wq3QLSysAhGf4lxGbxFwQQBkLURC/XP71PWMMfvqmhmPqlgtXqVRiux5C nJQ3xEsLCLYUe/CCd7XEEC8RzBZtuA== =qitT -----END PGP SIGNATURE----- --Sig_/8YejglQrq3zPUgCrXSL0TSk-- 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 0F308C433EF for ; Sun, 17 Jul 2022 23:45:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A403114B760; Sun, 17 Jul 2022 23:45:06 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 25C1714B267; Sun, 17 Jul 2022 23:45:03 +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 4LmMCB63PXz4xhn; Mon, 18 Jul 2022 09:44:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1658101499; bh=kQL7s0bv0QVHOf6xNkEQ6iRj458x4B3GPPXuqjZxsDI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=G9/V5bsYQdzT8lFlBqsJgYbE3dK4DCoDdyXL2f6eaU6ntUfOygHABeUCbQbW4QNUD wvSgw9eBM2hJaduED9ml1DITLUHnMrlPZ6rDi53PPtGA6rb5bT9V/p1R4n+gdlzOPj fwWM0GexHRPyUYE0QCQO/p3vlnYhbQNMoBWYYpVGuZWrhAdBVLOHcIs/+LRKMzle0y lIW8O9r0Xt2vDy7aWDXS25JPjOfvBwqwi6b995CNhmqN8wfYhAnIPx7UlpfeZzExX2 jbs+QbU8PsOIU5jgfKnEslfl3UDxvcLcIujcIOQDLpdqy7ZS7+BaiyBGdz8XXvSbkI pKKzU/b4E1Jpg== Date: Mon, 18 Jul 2022 09:44:53 +1000 From: Stephen Rothwell To: Dave Airlie Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20220718094453.2f1a1f09@canb.auug.org.au> In-Reply-To: <6e60d396-2a52-d1fa-f125-3c585605b531@amd.com> References: <20220711124742.3b151992@canb.auug.org.au> <6e60d396-2a52-d1fa-f125-3c585605b531@amd.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/8YejglQrq3zPUgCrXSL0TSk"; 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 , Daniel Vetter , 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_/8YejglQrq3zPUgCrXSL0TSk Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 11 Jul 2022 10:05:45 +0200 Christian K=C3=B6nig wrote: > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell: > > > > 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 >=20 > Sorry for the noise, the patch "5e3f1e7729ec ("drm/amdgpu: fix start > calculation in amdgpu_vram_mgr_new")" and another one is going to be > reverted from the drm tree as well. >=20 > It's just that -fixes patches where faster than -next patches. Here we are a week later, -rc7 has been released and as far as I can tell (though I may have missed it), this is still a problem :-( I am still reverting 925b6e59138c (which is now in Linus' tree). --=20 Cheers, Stephen Rothwell --Sig_/8YejglQrq3zPUgCrXSL0TSk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLUnvUACgkQAVBC80lX 0Gw6agf9GW4WNGxB7WRUxFOdrFlVRBxgU93UbVTP5tRDPx9AiZiDEOVvGTI6/QlL z8HL2oxR4QCqQBI3JeY+jGbOY/0DCn2OwtaKe1bTCYtdNbprgZxeTi4/x7dru2V9 Db8ypw5hqiNrXsLSE+RR+t2joQj3jkmnvNK4PXM78LyuXkt31TbrkBCU/vVtVjp6 xcnIlDP2jtiuPAbh1EZf/fPG3/fYKid+g35eSDLV2Y4gc0/CNUuP+D9dh4DaLAzW bBOEa40Wq3QLSysAhGf4lxGbxFwQQBkLURC/XP71PWMMfvqmhmPqlgtXqVRiux5C nJQ3xEsLCLYUe/CCd7XEEC8RzBZtuA== =qitT -----END PGP SIGNATURE----- --Sig_/8YejglQrq3zPUgCrXSL0TSk-- 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 B4742C43334 for ; Sun, 17 Jul 2022 23:45:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9437514B267; Sun, 17 Jul 2022 23:45:06 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 25C1714B267; Sun, 17 Jul 2022 23:45:03 +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 4LmMCB63PXz4xhn; Mon, 18 Jul 2022 09:44:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1658101499; bh=kQL7s0bv0QVHOf6xNkEQ6iRj458x4B3GPPXuqjZxsDI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=G9/V5bsYQdzT8lFlBqsJgYbE3dK4DCoDdyXL2f6eaU6ntUfOygHABeUCbQbW4QNUD wvSgw9eBM2hJaduED9ml1DITLUHnMrlPZ6rDi53PPtGA6rb5bT9V/p1R4n+gdlzOPj fwWM0GexHRPyUYE0QCQO/p3vlnYhbQNMoBWYYpVGuZWrhAdBVLOHcIs/+LRKMzle0y lIW8O9r0Xt2vDy7aWDXS25JPjOfvBwqwi6b995CNhmqN8wfYhAnIPx7UlpfeZzExX2 jbs+QbU8PsOIU5jgfKnEslfl3UDxvcLcIujcIOQDLpdqy7ZS7+BaiyBGdz8XXvSbkI pKKzU/b4E1Jpg== Date: Mon, 18 Jul 2022 09:44:53 +1000 From: Stephen Rothwell To: Dave Airlie Message-ID: <20220718094453.2f1a1f09@canb.auug.org.au> In-Reply-To: <6e60d396-2a52-d1fa-f125-3c585605b531@amd.com> References: <20220711124742.3b151992@canb.auug.org.au> <6e60d396-2a52-d1fa-f125-3c585605b531@amd.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/8YejglQrq3zPUgCrXSL0TSk"; protocol="application/pgp-signature"; micalg=pgp-sha256 Subject: Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes 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: Arunpravin Paneer Selvam , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Christian =?UTF-8?B?S8O2bmln?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" --Sig_/8YejglQrq3zPUgCrXSL0TSk Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 11 Jul 2022 10:05:45 +0200 Christian K=C3=B6nig wrote: > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell: > > > > 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 >=20 > Sorry for the noise, the patch "5e3f1e7729ec ("drm/amdgpu: fix start > calculation in amdgpu_vram_mgr_new")" and another one is going to be > reverted from the drm tree as well. >=20 > It's just that -fixes patches where faster than -next patches. Here we are a week later, -rc7 has been released and as far as I can tell (though I may have missed it), this is still a problem :-( I am still reverting 925b6e59138c (which is now in Linus' tree). --=20 Cheers, Stephen Rothwell --Sig_/8YejglQrq3zPUgCrXSL0TSk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLUnvUACgkQAVBC80lX 0Gw6agf9GW4WNGxB7WRUxFOdrFlVRBxgU93UbVTP5tRDPx9AiZiDEOVvGTI6/QlL z8HL2oxR4QCqQBI3JeY+jGbOY/0DCn2OwtaKe1bTCYtdNbprgZxeTi4/x7dru2V9 Db8ypw5hqiNrXsLSE+RR+t2joQj3jkmnvNK4PXM78LyuXkt31TbrkBCU/vVtVjp6 xcnIlDP2jtiuPAbh1EZf/fPG3/fYKid+g35eSDLV2Y4gc0/CNUuP+D9dh4DaLAzW bBOEa40Wq3QLSysAhGf4lxGbxFwQQBkLURC/XP71PWMMfvqmhmPqlgtXqVRiux5C nJQ3xEsLCLYUe/CCd7XEEC8RzBZtuA== =qitT -----END PGP SIGNATURE----- --Sig_/8YejglQrq3zPUgCrXSL0TSk--