linux-kernel - Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPM=9txm_fZX781zMr0RAS6uBD_FoE63THY-WaiB92xYEUrfTw@mail.gmail.com>
Date:   Wed, 27 Jul 2022 13:24:45 +1000
From:   Dave Airlie <airlied@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Dave Airlie <airlied@...ux.ie>,
        Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@....com>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Christian König <christian.koenig@....com>
Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree

On Wed, 27 Jul 2022 at 12:55, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > On Mon, 11 Jul 2022 10:05:45 +0200 Christian König <christian.koenig@....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.
> > >
> > > 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.
> > >
> > > 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).
>
> Ping?

My assumption is I fix this on sending my -next tree to Linus with a
resolution I create at that time?

Is there another option, we have this fixed in out drm-tip tree already.

Dave.