On Thu, 22 Sep 2022 10:23:38 +0200 Marc Kleine-Budde wrote:
> On 22.09.2022 10:04:55, Matthieu Baerts wrote:
> > FYI, we got a small conflict when merging -net in net-next in the MPTCP
> > tree due to this patch applied in -net:
> >
> > 5440428b3da6 ("can: gs_usb: gs_can_open(): fix race dev->can.state
> > condition")
> >
> > and this one from net-next:
> >
> > 45dfa45f52e6 ("can: gs_usb: add RX and TX hardware timestamp support")
> >
> > The conflict has been resolved on our side[1] and the resolution we
> > suggest is attached to this email.
Thanks for the resolution! If you happen to remember perhaps throw
"manual merge" into the subject. That's what I search my inbox for
when merging, it will allow us to be even more lazy :)
