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

2018-04-04 Thread Stephen Rothwell
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 > bandw

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

2017-07-02 Thread Stephen Rothwell
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

2017-06-21 Thread Stephen Rothwell
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

2017-06-21 Thread Kalle Valo
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 commit:

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

2012-12-09 Thread Grumbach, Emmanuel
> 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