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
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
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
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
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
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
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
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,
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
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,
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
>
On Fri, Feb 22, 2013 at 2:50 AM, Stephen Rothwell s...@canb.auug.org.au 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
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")
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) from
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
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
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
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 tree.
18 matches
Mail list logo