linux-kernel - linux-next: manual merge of the rdma tree with Linus' 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>] [day] [month] [year] [list]

Message-ID: <20250106111307.7d0f55ba@canb.auug.org.au>
Date: Mon, 6 Jan 2025 11:13:07 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Doug Ledford <dledford@...hat.com>, Jason Gunthorpe <jgg@...lanox.com>
Cc: Bernard Metzler <bmt@...ich.ibm.com>, Junxian Huang
 <huangjunxian6@...ilicon.com>, Leon Romanovsky <leon@...nel.org>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Yuyu Li <liyuyu6@...wei.com>
Subject: linux-next: manual merge of the rdma tree with Linus' tree

Hi all,

Today's linux-next merge of the rdma tree got conflicts in:

  drivers/infiniband/sw/siw/siw_main.c
  drivers/infiniband/sw/siw/siw_verbs.c

between commit:

  16b87037b488 ("RDMA/siw: Remove direct link to net_device")

from Linus' tree and commit:

  62f5d59d1a3d ("RDMA/siw: Remove deliver net device event")

from the rdma tree.

I fixed it up (I used the former version of siw_verbs.c and the
superset parts of siw_main.c) 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

Content of type "application/pgp-signature" skipped