On Thu, May 14, 2020 at 12:59:20PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
>
> between commit:
>
> 2be08c308f10 ("RDMA/mlx5: Delete create QP flags obfuscation")
>
> from the rdma tree
Hi all,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
between commit:
2be08c308f10 ("RDMA/mlx5: Delete create QP flags obfuscation")
from the rdma tree and commit:
14c129e30152 ("{IB/net}/mlx5: Simplify don't trap code")
from the
On Mon, Jul 08, 2019 at 01:28:37PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 4 Jul 2019 12:47:38 +1000 Stephen Rothwell
> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the mlx5-next tree got a conflict in:
> >
> > drivers/infiniband/hw/mlx5/cq.c
> >
> > between
Hi all,
On Thu, 4 Jul 2019 12:47:38 +1000 Stephen Rothwell
wrote:
>
> Hi all,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/cq.c
>
> between commit:
>
> e39afe3d6dbd ("RDMA: Convert CQ allocations to be under core
>
On Thu, Jul 04, 2019 at 12:47:38PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/cq.c
>
> between commit:
>
> e39afe3d6dbd ("RDMA: Convert CQ allocations to be under core
> responsibility")
>
>
Hi all,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/cq.c
between commit:
e39afe3d6dbd ("RDMA: Convert CQ allocations to be under core responsibility")
from the rdma tree and commit:
38164b771947 ("net/mlx5: mlx5_core_create_cq()
Hi Leon,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
between commit:
35b0aa67b298 ("RDMA/mlx5: Refactor netdev affinity code")
from the rdma tree and commit:
c42260f19545 ("net/mlx5: Separate and generalize dma device from pci
On Wed, Dec 05, 2018 at 01:10:50PM +1100, Stephen Rothwell wrote:
> Hi Doug,
>
> On Tue, 04 Dec 2018 20:33:08 -0500 Doug Ledford wrote:
> >
> > FWIW this will go away in a day or two. I merged mlx5-next into rdma
> > for-next in order to take a series that depended on it.
>
> Understood, thanks.
On Wed, Dec 05, 2018 at 01:10:50PM +1100, Stephen Rothwell wrote:
> Hi Doug,
>
> On Tue, 04 Dec 2018 20:33:08 -0500 Doug Ledford wrote:
> >
> > FWIW this will go away in a day or two. I merged mlx5-next into rdma
> > for-next in order to take a series that depended on it.
>
> Understood, thanks.
Hi Doug,
On Tue, 04 Dec 2018 20:33:08 -0500 Doug Ledford wrote:
>
> FWIW this will go away in a day or two. I merged mlx5-next into rdma
> for-next in order to take a series that depended on it.
Understood, thanks.
--
Cheers,
Stephen Rothwell
pgpzySMSxk_jZ.pgp
Description: OpenPGP digital
Hi Doug,
On Tue, 04 Dec 2018 20:33:08 -0500 Doug Ledford wrote:
>
> FWIW this will go away in a day or two. I merged mlx5-next into rdma
> for-next in order to take a series that depended on it.
Understood, thanks.
--
Cheers,
Stephen Rothwell
pgpzySMSxk_jZ.pgp
Description: OpenPGP digital
FWIW this will go away in a day or two. I merged mlx5-next into rdma
for-next in order to take a series that depended on it.
On Wed, 2018-12-05 at 12:07 +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
>
FWIW this will go away in a day or two. I merged mlx5-next into rdma
for-next in order to take a series that depended on it.
On Wed, 2018-12-05 at 12:07 +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
>
Hi Leon,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
between commit:
36e235c88299 ("RDMA/mlx5: Use the uapi disablement APIs instead of code")
from the rdma tree and commit:
81773ce5f07f
Hi Leon,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
between commit:
36e235c88299 ("RDMA/mlx5: Use the uapi disablement APIs instead of code")
from the rdma tree and commit:
81773ce5f07f
On Wed, Nov 21, 2018 at 11:04:32AM +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
>
> between commit:
>
> 9afc97c29b03 ("mlx5: remove support for ib_get_vector_affinity")
>
> from the rdma
On Wed, Nov 21, 2018 at 11:04:32AM +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
>
> between commit:
>
> 9afc97c29b03 ("mlx5: remove support for ib_get_vector_affinity")
>
> from the rdma
Hi Leon,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
between commit:
9afc97c29b03 ("mlx5: remove support for ib_get_vector_affinity")
from the rdma tree and commit:
f2f3df550139 ("net/mlx5: EQ, Privatize eq_table and friends")
Hi Leon,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
between commit:
9afc97c29b03 ("mlx5: remove support for ib_get_vector_affinity")
from the rdma tree and commit:
f2f3df550139 ("net/mlx5: EQ, Privatize eq_table and friends")
19 matches
Mail list logo
