Re: linux-next: manual merge of the net-next tree with Linus' tree

[Marc Kleine-Budde]

On 28.10.2022 10:28:11, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
> 
> between commit:
> 
>   2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_completion")
> 
> from Linus' tree and commit:
> 
>   abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start")
> 
> from the net-next 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 to me!

Thanks,
Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

Attachment: signature.asc
Description: PGP signature