Re: linux-next: manual merge of the net-next tree with the infiniband tree
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 > > ("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 net-next tree. > > > > I think that they are 2 different fixes for the same problem, so I just > > used the net-next version and can carry the fix as necessary (no action > > is required). > > Commit 5b0c275926b8 also keeps the intention of the original patch which > broke it, which was to return an error code, in case the allocation fails. > Commit 9919d5bd01b9 fix will return 0 in case the allocation fails. > > We should keep the other fix or fix the code again to return the proper > error code. OK, so today I switched the conflict fix to use the version from the infiniband tree. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpUpBhramruW.pgp Description: PGP signature
Re: linux-next: manual merge of the net-next tree with the infiniband tree
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 commit 9919d5bd01b9 ("RDMA/cxgb4: Fix onchip queue > support for T5") from the net-next tree. > > I think that they are 2 different fixes for the same problem, so I just > used the net-next version and can carry the fix as necessary (no action > is required). > > -- > Cheers, > Stephen Rothwells...@canb.auug.org.au Commit 5b0c275926b8 also keeps the intention of the original patch which broke it, which was to return an error code, in case the allocation fails. Commit 9919d5bd01b9 fix will return 0 in case the allocation fails. We should keep the other fix or fix the code again to return the proper error code. Regards. Cascardo. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the net-next tree with the infiniband tree
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 of LRO support") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Acked-by: Or Geritz -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the net-next tree with the infiniband tree
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 ("{NET, IB}/mlx4: Add device managed flow steering > firmware API") from the net-next tree. > > Just context changes. I fixed it up (see below) and can carry the fix > as necessary. Thanks, Stephen! Your merge looks fine. Ack. -Jack -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the net-next tree with the infiniband tree
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 them") from the infiniband tree and commit > 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware > API") from the net-next tree. > > Just context changes (I think). I have fixed it up (see below) and can > carry the fix as necessary. Thanks, Stephen! Ack for IB side. -Jack -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the net-next tree with the infiniband tree
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 infiniband tree and commit 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware API") from the net-next tree. Just context changes (I think). I have fixed it up (see below) and can carry the fix as necessary. Thanks Stephen. Please add: Acked-by: Hadar Hen Zion Hadar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the net-next tree with the infiniband tree
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: Add device managed flow steering firmware API") from the net-next tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. Thanks Stephen. Please add: Acked-by: Hadar Hen Zion Hadar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/