linux-kernel - Re: linux-next: manual merge of the driver-core 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-prev] [day] [month] [year] [list]

Message-ID: <20250730091548.0d669f33@canb.auug.org.au>
Date: Wed, 30 Jul 2025 09:15:48 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: Dennis Dalessandro <dennis.dalessandro@...nelisnetworks.com>, Greg
 Kroah-Hartman <gregkh@...uxfoundation.org>, Jason Gunthorpe
 <jgg@...dia.com>, Jason Gunthorpe <jgg@...pe.ca>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Thomas Weißschuh
 <linux@...ssschuh.net>
Subject: Re: linux-next: manual merge of the driver-core tree with the rdma
 tree

Hi all,

On Thu, 19 Jun 2025 16:30:41 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/infiniband/hw/qib/qib_sysfs.c
> 
> between commit:
> 
>   24baad32b710 ("RDMA/qib: Remove outdated driver")
> 
> from the rdma tree and commit:
> 
>   fb506e31b3d5 ("sysfs: treewide: switch back to attribute_group::bin_attrs")
> 
> from the driver-core tree.
> 
> I fixed it up (I just removed the file) 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.

This is now a conflict between the rdma tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped