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

2020-12-15 Thread Bjorn Helgaas
On Tue, Dec 15, 2020 at 01:04:25PM -0500, Alex Deucher wrote: > On Tue, Dec 15, 2020 at 12:25 PM Bjorn Helgaas wrote: > > > > 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

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

2020-12-15 Thread Alex Deucher
On Tue, Dec 15, 2020 at 12:25 PM Bjorn Helgaas wrote: > > 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

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

2020-12-15 Thread 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 wrote: > > > > On Tue, Dec 15, 2020 at 07:34:31AM +1100,

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

2020-12-14 Thread Kuppuswamy, Sathyanarayanan
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 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

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

2020-12-14 Thread Bjorn Helgaas
On Mon, Dec 14, 2020 at 06:18:54PM -0500, Alex Deucher wrote: > On Mon, Dec 14, 2020 at 6:16 PM Bjorn Helgaas 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 > > > wrote: > > > > > > > >

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

2020-12-14 Thread Alex Deucher
On Mon, Dec 14, 2020 at 6:16 PM Bjorn Helgaas 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 > > wrote: > > > > > > Today's linux-next merge of the amdgpu tree got a conflict in: > > > > > >

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

2020-12-14 Thread Bjorn Helgaas
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 > wrote: > > > > Today's linux-next merge of the amdgpu tree got a conflict in: > > > > drivers/pci/pcie/err.c > > > > between commits: > > > > 8f1bbfbc3596

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

2020-12-14 Thread Stephen Rothwell
Hi all, On Tue, 8 Dec 2020 13:56:20 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the amdgpu tree got a conflict in: > > drivers/pci/pcie/err.c > > between commits: > > 8f1bbfbc3596 ("PCI/ERR: Rename reset_link() to reset_subordinates()") > 0791721d8007 ("PCI/ERR: Use

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

2020-12-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/pci/pcie/err.c between commits: 8f1bbfbc3596 ("PCI/ERR: Rename reset_link() to reset_subordinates()") 0791721d8007 ("PCI/ERR: Use "bridge" for clarity in pcie_do_recovery()") 05e9ae19ab83 ("PCI/ERR: Add