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

2013-04-25 Thread Stephen Rothwell
Hi Cascardo, On Wed, 24 Apr 2013 14:53:04 -0300 Thadeu Lima de Souza Cascardo wrote: > > On Thu, Apr 18, 2013 at 01:18:43PM +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the net-next tree got a conflict in > > drivers/infiniband/hw/cxgb4/qp.c between commit 5b0c275926b8 >

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

2013-04-25 Thread Stephen Rothwell
Hi Cascardo, On Wed, 24 Apr 2013 14:53:04 -0300 Thadeu Lima de Souza Cascardo casca...@linux.vnet.ibm.com wrote: On Thu, Apr 18, 2013 at 01:18:43PM +1000, Stephen Rothwell wrote: Today's linux-next merge of the net-next tree got a conflict in drivers/infiniband/hw/cxgb4/qp.c between

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

2013-04-24 Thread Thadeu Lima de Souza Cascardo
On Thu, Apr 18, 2013 at 01:18:43PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > drivers/infiniband/hw/cxgb4/qp.c between commit 5b0c275926b8 > ("RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled") from the > infiniband tree

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

2013-04-24 Thread Thadeu Lima de Souza Cascardo
On Thu, Apr 18, 2013 at 01:18:43PM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/infiniband/hw/cxgb4/qp.c between commit 5b0c275926b8 (RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled) from the infiniband tree and

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

2013-04-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/infiniband/hw/cxgb4/qp.c between commit 5b0c275926b8 ("RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled") from the infiniband tree and commit 9919d5bd01b9 ("RDMA/cxgb4: Fix onchip queue support for T5") from

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

2013-04-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/infiniband/hw/cxgb4/qp.c between commit 5b0c275926b8 (RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled) from the infiniband tree and commit 9919d5bd01b9 (RDMA/cxgb4: Fix onchip queue support for T5) from the

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

2012-11-26 Thread Or Gerlitz
On 27/11/2012 02:47, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/en_rx.c between commit 08ff32352d6f ("mlx4: 64-byte CQE/EQE support") from the infiniband tree and commit f1d29a3fa68b ("mlx4_en: Remove

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

2012-11-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/en_rx.c between commit 08ff32352d6f ("mlx4: 64-byte CQE/EQE support") from the infiniband tree and commit f1d29a3fa68b ("mlx4_en: Remove remnants of LRO support") from the net-next tree. I

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

2012-11-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/en_rx.c between commit 08ff32352d6f (mlx4: 64-byte CQE/EQE support) from the infiniband tree and commit f1d29a3fa68b (mlx4_en: Remove remnants of LRO support) from the net-next tree. I

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

2012-11-26 Thread Or Gerlitz
On 27/11/2012 02:47, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/en_rx.c between commit 08ff32352d6f (mlx4: 64-byte CQE/EQE support) from the infiniband tree and commit f1d29a3fa68b (mlx4_en: Remove remnants

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

2012-07-16 Thread Jack Morgenstein
On Thursday 12 July 2012 05:13, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > include/linux/mlx4/device.h between commit 396f2feb05d7 ("mlx4_core: > Implement mechanism for reserved Q_Keys") from the infiniband tree and > commit

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

2012-07-16 Thread Jack Morgenstein
On Thursday 12 July 2012 05:09, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 > ("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct > and

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

2012-07-16 Thread Jack Morgenstein
On Thursday 12 July 2012 05:09, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 (mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize

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

2012-07-16 Thread Jack Morgenstein
On Thursday 12 July 2012 05:13, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/mlx4/device.h between commit 396f2feb05d7 (mlx4_core: Implement mechanism for reserved Q_Keys) from the infiniband tree and commit 0ff1fb654bec

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

2012-07-12 Thread Hadar Hen Zion
On 7/12/2012 5:09 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 ("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize them") from the

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

2012-07-12 Thread Hadar Hen Zion
On 7/12/2012 5:13 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/mlx4/device.h between commit 396f2feb05d7 ("mlx4_core: Implement mechanism for reserved Q_Keys") from the infiniband tree and commit 0ff1fb654bec ("{NET, IB}/mlx4:

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

2012-07-12 Thread Hadar Hen Zion
On 7/12/2012 5:13 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/mlx4/device.h between commit 396f2feb05d7 (mlx4_core: Implement mechanism for reserved Q_Keys) from the infiniband tree and commit 0ff1fb654bec ({NET, IB}/mlx4:

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

2012-07-12 Thread Hadar Hen Zion
On 7/12/2012 5:09 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 (mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize them) from the

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

2012-07-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/mlx4/device.h between commit 396f2feb05d7 ("mlx4_core: Implement mechanism for reserved Q_Keys") from the infiniband tree and commit 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware API")

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

2012-07-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 ("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize them") from the infiniband tree and commit 0ff1fb654bec ("{NET,

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

2012-07-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 (mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize them) from the infiniband tree and commit 0ff1fb654bec ({NET,

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

2012-07-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/mlx4/device.h between commit 396f2feb05d7 (mlx4_core: Implement mechanism for reserved Q_Keys) from the infiniband tree and commit 0ff1fb654bec ({NET, IB}/mlx4: Add device managed flow steering firmware API)