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

2017-09-05 Thread Stephen Rothwell
Hi Sinan, On Tue, 5 Sep 2017 18:54:38 -0400 Sinan Kaya wrote: > > On 9/4/2017 12:54 AM, Stephen Rothwell wrote: > > Just a reminder that this conflict still exists. > > I suppose this was a message for Bjorn, right? Correct. It was just a reminder that he may have to tell Linus about the con

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

2017-09-05 Thread Sinan Kaya
On 9/4/2017 12:54 AM, Stephen Rothwell wrote: > Just a reminder that this conflict still exists. I suppose this was a message for Bjorn, right? I looked at the change and it looked good to me. -- Sinan Kaya Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Q

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

2017-09-03 Thread Stephen Rothwell
Hi all, On Wed, 16 Aug 2017 09:51:28 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the pci tree got a conflict in: > > drivers/pci/probe.c > > between commit: > > a99b646afa8a ("PCI: Disable PCIe Relaxed Ordering if unsupported") > > from the net tree and commit: > > 6

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

2017-08-15 Thread Stephen Rothwell
Hi Bjorn, Today's linux-next merge of the pci tree got a conflict in: drivers/pci/probe.c between commit: a99b646afa8a ("PCI: Disable PCIe Relaxed Ordering if unsupported") from the net tree and commit: 62ce94a7a5a5 ("PCI: Mark Broadcom HT2100 Root Port Extended Tags as broken") from t