Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 18 Jul 2022 09:44:53 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@linux.ie>
Cc:     Christian =?UTF-8?B?S8O2bmln?= <christian.koenig@amd.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
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

--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 <christian.koenig@a=
md.com> 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--