On Tue, Oct 04, 2022 at 05:33:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/fwserial/fwserial.c
>
> between commit:
>
> a8c11c152034 ("tty: Make ->set_termios() old ktermios const")
>
> from the tty tree and commit:
>
> db65becab2a3 ("staging: fwserial: delete the driver.")
>
> from the staging tree.
>
> I fixed it up (I deleted 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.
Fix is correct, thanks.
greg k-h
