linux-kernel - Re: 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250514081738.GN22843@unreal>
Date: Wed, 14 May 2025 11:17:38 +0300
From: Leon Romanovsky <leon@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jason Gunthorpe <jgg@...dia.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Shay Drory <shayd@...dia.com>
Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree

On Wed, May 14, 2025 at 12:24:55PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   drivers/infiniband/core/umem_odp.c
> 
> between commit:
> 
>   9a0e6f15029e ("RDMA/core: Silence oversized kvmalloc() warning")
> 
> from Linus' tree and commit:
> 
>   1efe8c0670d6 ("RDMA/core: Convert UMEM ODP DMA mapping to caching IOVA and page linkage")
> 
> from the rdma tree.
> 
> I fixed it up (the latter removed the code updated by the former) 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.

Thanks, this is the right resolution.

> 
> -- 
> Cheers,
> Stephen Rothwell