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

Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/pci/Kconfig drivers/pci/controller/pci-hyperv.c between commit: f58ba5e3f686 ("PCI: pci-hyperv: Fix build errors on non-SYSFS config") 44b1ece783ff ("PCI: hv: Detect and fix Hyper-V PCI domain number

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

Hi all, On Tue, 3 Apr 2018 13:14:54 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_main.c > > between commit: > > 2907938d2375 ("net/mlx5e: Use

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

Hi all, On Tue, 3 Apr 2018 13:14:54 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_main.c > > between commit: > > 2907938d2375 ("net/mlx5e: Use pcie_bandwidth_available() to compute >

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en_main.c between commit: 2907938d2375 ("net/mlx5e: Use pcie_bandwidth_available() to compute bandwidth") from the pci tree and commit: 0608d4dbaf4e ("net/mlx5e: Unify slow

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en_main.c between commit: 2907938d2375 ("net/mlx5e: Use pcie_bandwidth_available() to compute bandwidth") from the pci tree and commit: 0608d4dbaf4e ("net/mlx5e: Unify slow

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

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Wed, 21 Jun 2017 11:54:43 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/marvell/mwifiex/pcie.c > >

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

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Wed, 21 Jun 2017 11:54:43 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/marvell/mwifiex/pcie.c > > between commit: > >

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

Hi Kalle, On Wed, 21 Jun 2017 16:29:29 +0300 Kalle Valo wrote: > > Thanks, the fix looks good to me. I guess there's nothing I can do at > the moment and Linus needs to fix this when he pulls from Dave (or > Bjorn, whichever is the last)? Right. -- Cheers, Stephen

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

Hi Kalle, On Wed, 21 Jun 2017 16:29:29 +0300 Kalle Valo wrote: > > Thanks, the fix looks good to me. I guess there's nothing I can do at > the moment and Linus needs to fix this when he pulls from Dave (or > Bjorn, whichever is the last)? Right. -- Cheers, Stephen Rothwell

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

Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/marvell/mwifiex/pcie.c > > between commit: > > c336cc0ee4eb ("PCI: Split ->reset_notify() method into > ->reset_prepare() and ->reset_done()") > > from

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

Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/marvell/mwifiex/pcie.c > > between commit: > > c336cc0ee4eb ("PCI: Split ->reset_notify() method into > ->reset_prepare() and ->reset_done()") > > from the pci tree and

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/wireless/marvell/mwifiex/pcie.c between commit: c336cc0ee4eb ("PCI: Split ->reset_notify() method into ->reset_prepare() and ->reset_done()") from the pci tree and commit: 68efd0386988 ("mwifiex:

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/wireless/marvell/mwifiex/pcie.c between commit: c336cc0ee4eb ("PCI: Split ->reset_notify() method into ->reset_prepare() and ->reset_done()") from the pci tree and commit: 68efd0386988 ("mwifiex:

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

Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/pci/msi.c include/linux/pci.h between commit: 688769f643bf ("PCI/MSI: Make pci_msi_shutdown() and pci_msix_shutdown() static") from the pci tree and commit: 4244de1c64de ("PCI: remove pci_enable_msix")

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

Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/pci/msi.c include/linux/pci.h between commit: 688769f643bf ("PCI/MSI: Make pci_msi_shutdown() and pci_msix_shutdown() static") from the pci tree and commit: 4244de1c64de ("PCI: remove pci_enable_msix")

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/pci_ids.h between commit: a755e169031d ("PCI: Add Netronome vendor and device IDs") from the pci tree and commit: 2d1e0254ef83 ("pci_ids: add Netronome Systems vendor") from the net-next tree. I

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/pci_ids.h between commit: a755e169031d ("PCI: Add Netronome vendor and device IDs") from the pci tree and commit: 2d1e0254ef83 ("pci_ids: add Netronome Systems vendor") from the net-next tree. I

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/pci.h between commit f39d5b72913e ("PCI: Remove "extern" from function declarations") from the pci tree and commit 5a8eb24292ff ("pci: Add SRIOV helper function to determine if VFs are assigned to guest") from

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/pci.h between commit f39d5b72913e (PCI: Remove extern from function declarations) from the pci tree and commit 5a8eb24292ff (pci: Add SRIOV helper function to determine if VFs are assigned to guest) from the

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

> Today's linux-next merge of the net-next tree got a conflict in > drivers/net/wireless/iwlwifi/pcie/trans.c between commit b9d146e30a2d > ("iwlwifi: collapse wrapper for pcie_capability_read_word()") from the pci > tree and commit 7afe3705cd4e ("iwlwifi: continue clean up - > pcie/trans.c") from

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/wireless/iwlwifi/pcie/trans.c between commit b9d146e30a2d ("iwlwifi: collapse wrapper for pcie_capability_read_word()") from the pci tree and commit 7afe3705cd4e ("iwlwifi: continue clean up - pcie/trans.c") from

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/wireless/iwlwifi/pcie/trans.c between commit b9d146e30a2d (iwlwifi: collapse wrapper for pcie_capability_read_word()) from the pci tree and commit 7afe3705cd4e (iwlwifi: continue clean up - pcie/trans.c) from the

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

Today's linux-next merge of the net-next tree got a conflict in drivers/net/wireless/iwlwifi/pcie/trans.c between commit b9d146e30a2d (iwlwifi: collapse wrapper for pcie_capability_read_word()) from the pci tree and commit 7afe3705cd4e (iwlwifi: continue clean up - pcie/trans.c) from the