Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree

[Dinh Nguyen]

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