On 1/20/21 9:36 PM, Jakub Kicinski wrote: >>>> Note: Patch 1/3 touches "drivers/net/can/dev.c". In net-next/master this file >>>> has been moved to drivers/net/can/dev/dev.c [1] and parts of it have been >>>> transfered into separate files. This may result in a merge conflict. Please >>>> carry this patch forward, the change is rather simple. Drop us a note if >>>> needed. Are any actions needed with regards to linux-next? >>> >>> Thanks for the note, I'm sending the PR to Linus now, so I think >>> linux-next may never see the the conflict. > > The merge has been done now, could you double check? Looks good! 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: OpenPGP digital signature
