public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Doug Ledford <dledford@redhat•com>, Jason Gunthorpe <jgg@mellanox•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Daniel Jurgens <danielj@mellanox•com>,
	Leon Romanovsky <leon@kernel•org>
Subject: Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree
Date: Wed, 17 Jan 2018 12:55:37 +1100	[thread overview]
Message-ID: <20180117125537.06e46610@canb.auug.org.au> (raw)
In-Reply-To: <20180117125145.731ba88b@canb.auug.org.au>

Hi all,

On Wed, 17 Jan 2018 12:51:45 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> diff --cc drivers/infiniband/hw/mlx5/qp.c
> index cffe5966aef9,ae36db3d0deb..000000000000
> --- a/drivers/infiniband/hw/mlx5/qp.c
> +++ b/drivers/infiniband/hw/mlx5/qp.c
> @@@ -4361,12 -4674,12 +4674,11 @@@ static void to_rdma_ah_attr(struct mlx5
>   
>   	memset(ah_attr, 0, sizeof(*ah_attr));
>   
> - 	if (!path->port || path->port > MLX5_CAP_GEN(dev, num_ports))
>  -	ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, path->port);
>  -	rdma_ah_set_port_num(ah_attr, path->port);
>  -	if (rdma_ah_get_port_num(ah_attr) == 0 ||
>  -	    rdma_ah_get_port_num(ah_attr) > ibdev->num_ports)
> ++	if (!path->port || path->port > ibdev->num_ports))

I fixed up the extra ')'.  Sorry about that,

-- 
Cheers,
Stephen Rothwell

  reply	other threads:[~2018-01-17  1:55 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-17  1:51 linux-next: manual merge of the rdma tree with the rdma-fixes tree Stephen Rothwell
2018-01-17  1:55 ` Stephen Rothwell [this message]
2018-01-17  3:03   ` Jason Gunthorpe
  -- strict thread matches above, loose matches on Subject: below --
2018-03-22  0:45 Stephen Rothwell
2018-05-01  0:10 Stephen Rothwell
2018-05-01  0:55 ` Doug Ledford
2018-05-02 10:22   ` Leon Romanovsky
2018-05-02 14:00     ` Doug Ledford
2018-05-02 17:50       ` Jason Gunthorpe
2018-06-27  0:07 Stephen Rothwell
2018-06-27  5:50 ` Leon Romanovsky
2018-07-10  1:17 Stephen Rothwell
2018-07-10  5:19 ` Leon Romanovsky
2019-08-23  2:22 Stephen Rothwell
2019-08-23 15:02 ` Jason Gunthorpe
2021-09-30  1:35 Stephen Rothwell
2021-10-01 13:52 ` Jason Gunthorpe
2022-01-06  0:44 Stephen Rothwell
2023-09-28  1:38 Stephen Rothwell
2023-09-28  9:59 ` Leon Romanovsky
2025-03-06  1:37 Stephen Rothwell
2025-03-06 10:24 ` Zhu Yanjun
2025-03-06 11:35   ` Zhu Yanjun
     [not found] ` <4d66668a-ff8e-48f6-a5e3-98ada08c5037@linux.dev>
2025-03-06 20:33   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180117125537.06e46610@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=danielj@mellanox$(echo .)com \
    --cc=dledford@redhat$(echo .)com \
    --cc=jgg@mellanox$(echo .)com \
    --cc=leon@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox