From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Leon Romanovsky <leon@kernel•org>,
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>,
Yishai Hadas <yishaih@mellanox•com>
Subject: linux-next: manual merge of the mlx5-next tree with the rdma tree
Date: Thu, 4 Jul 2019 12:47:38 +1000 [thread overview]
Message-ID: <20190704124738.1e88cb69@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]
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() enhancements")
from the mlx5-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/infiniband/hw/mlx5/cq.c
index bfe3efdd77d7,4efbbd2fce0c..000000000000
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@@ -891,7 -891,8 +891,8 @@@ int mlx5_ib_create_cq(struct ib_cq *ibc
int entries = attr->cqe;
int vector = attr->comp_vector;
struct mlx5_ib_dev *dev = to_mdev(ibdev);
+ u32 out[MLX5_ST_SZ_DW(create_cq_out)];
- struct mlx5_ib_cq *cq;
+ struct mlx5_ib_cq *cq = to_mcq(ibcq);
int uninitialized_var(index);
int uninitialized_var(inlen);
u32 *cqb = NULL;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-07-04 2:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 2:47 Stephen Rothwell [this message]
2019-07-04 6:27 ` linux-next: manual merge of the mlx5-next tree with the rdma tree Leon Romanovsky
2019-07-08 3:28 ` Stephen Rothwell
2019-07-08 16:09 ` Jason Gunthorpe
-- strict thread matches above, loose matches on Subject: below --
2026-03-17 16:00 Mark Brown
2020-05-14 2:59 Stephen Rothwell
2020-05-14 5:54 ` Leon Romanovsky
2019-04-30 3:58 Stephen Rothwell
2019-05-06 4:01 ` Stephen Rothwell
2019-05-06 4:13 ` Leon Romanovsky
2019-05-09 1:07 ` Stephen Rothwell
2018-12-05 1:07 Stephen Rothwell
2018-12-05 1:33 ` Doug Ledford
2018-12-05 2:10 ` Stephen Rothwell
2018-12-05 6:30 ` Leon Romanovsky
2018-11-21 0:04 Stephen Rothwell
2018-11-21 7:16 ` Leon Romanovsky
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=20190704124738.1e88cb69@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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 \
--cc=yishaih@mellanox$(echo .)com \
/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