Re: linux-next: manual merge of the amdgpu tree with the pci tree

[Bjorn Helgaas]

On Mon, Dec 14, 2020 at 10:52:26PM -0800, Kuppuswamy, Sathyanarayanan wrote:
> On 12/14/20 3:37 PM, Bjorn Helgaas wrote:
> > On Mon, Dec 14, 2020 at 06:18:54PM -0500, Alex Deucher wrote:
> > > On Mon, Dec 14, 2020 at 6:16 PM Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
> > > > On Tue, Dec 15, 2020 at 07:34:31AM +1100, Stephen Rothwell wrote:
> > > > > Hi all,
> > > > > 
> > > > > On Tue, 8 Dec 2020 13:56:20 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> > > > > > 
> 
> > > 
> > > I don't plan to merge this upstream via my tree.  I was just carrying
> > > it in my drm-next branch because we have a number of users that depend
> > > on it for working DPC and a number of people use this branch for
> > > testing.
> > 
> > OK, thanks.  FWIW, it's currently marked "Changes Requested" in
> > patchwork, so it isn't really going anywhere right now:
> > 
> > https://patchwork.kernel.org/project/linux-pci/patch/cbba08a5e9ca62778c8937f44eda2192a2045da7.1595617529.git.sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx/
>
> There is a newer version of this patch set. Please use it when
> merging this patch.
> https://patchwork.kernel.org/project/linux-pci/list/?series=370855

That one is still pending.  I haven't had a chance to look at it yet,
but seems like there's no point in carrying the superseded version in
drm-next.