linux-kernel - linux-next: manual merge of the mlx5-next tree with the rdma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 4 Jul 2019 12:47:38 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Leon Romanovsky <leon@...nel.org>,
        Doug Ledford <dledford@...hat.com>,
        Jason Gunthorpe <jgg@...lanox.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Yishai Hadas <yishaih@...lanox.com>
Subject: linux-next: manual merge of the mlx5-next tree with the rdma tree

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;

Content of type "application/pgp-signature" skipped