linux-kernel - Re: linux-next: manual merge of the char-misc tree with the char-misc.current 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: <56ae38d8-4aea-453a-961f-c640c1eb6ca8@kernel.org>
Date: Fri, 14 Nov 2025 13:10:18 -0600
From: Dinh Nguyen <dinguyen@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>,
 Arnd Bergmann <arnd@...db.de>
Cc: Ang Tien Sung <tiensung.ang@...era.com>,
 Khairul Anuar Romli <khairul.anuar.romli@...era.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Mahesh Rao <mahesh.rao@...era.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 char-misc.current tree



On 11/13/25 21:32, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>    drivers/firmware/stratix10-svc.c
> 
> between commit:
> 
>    d0fcf70c680e ("firmware: stratix10-svc: fix bug in saving controller data")
> 
> from the char-misc.current tree and commit:
> 
>    bcb9f4f07061 ("firmware: stratix10-svc: Add support for async communication")
> 
> from the char-misc 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.
> 

The fix looks good.

Thank you,

Dinh