linux-next: manual merge of the infiniband tree with Linus' tree

2015-02-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/infiniband/hw/mlx4/main.c between commit 146d6e19832a ("IB/mlx4: Create mirror flows in port aggregation mode") from Linus' tree and commit e9a7faf11af9 ("IB/mlx4: Fix wrong usage of IPv4 protocol for multicast attac

linux-next: manual merge of the infiniband tree with Linus' tree

2014-12-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/infiniband/hw/mlx5/mr.c between commit 479163f46082 ("mlx5: don't duplicate kvfree()") from Linus' tree and commit 89c925949c1f ("IB/mlx5: Implement on demand paging by adding support for MMU notifiers") from the inf

linux-next: manual merge of the infiniband tree with Linus' tree

2014-10-14 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/infiniband/hw/mlx5/qp.c between commit c7a08ac7ee68 ("net/mlx5_core: Update device capabilities handling") from Linus' tree and commit f83b42636a91 ("IB/mlx5: Remove duplicate code from mlx5_set_path") from the infin

Re: linux-next: manual merge of the infiniband tree with Linus' tree

2013-02-25 Thread Or Gerlitz
On 26/02/2013 02:45, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d ("net/mlx4_core: Use firmware driven flow steering hash mode") from Linus' tree and commit e448834e3545 ("m

linux-next: manual merge of the infiniband tree with Linus' tree

2013-02-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d ("net/mlx4_core: Use firmware driven flow steering hash mode") from Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in {INIT, QUERY

Re: linux-next: manual merge of the infiniband tree with Linus' tree

2013-02-22 Thread Or Gerlitz
On Fri, Feb 22, 2013 at 2:50 AM, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the infiniband tree got a conflict in > drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4 > ("ethtool: fix drvinfo strings set in drivers") from the tree and commit > 4b4868

linux-next: manual merge of the infiniband tree with Linus' tree

2013-02-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4 ("ethtool: fix drvinfo strings set in drivers") from the tree and commit 4b48680b5572 ("IPoIB: Add version and firmware info to ethtool reporting") fr

linux-next: manual merge of the infiniband tree with Linus' tree

2012-09-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit a8edc3bf05a3 ("net/mlx4_core: Put Firmware flow steering structures in common header files") from Linus' tree and commit 6b6f29c687ce ("mlx4_core: Stash PCI ID driver_

linux-next: manual merge of the infiniband tree with Linus' tree

2012-07-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/infiniband/hw/ocrdma/ocrdma_main.c between commit 6ab6827ee999 ("RDMA/ocrdma: Fixed GID table for vlan and events") from Linus' tree and commit 898648347205 ("IB: Use IS_ENABLED(CONFIG_IPV6)") from the infiniband tre