On 11.06.2022 23:42:39, Vincent Mailhol wrote: > > > This part of the patch does not apply. It conflicts with > > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=5f02ecbe08d6a3434a14b92bee98adec76e8808e > > > > > > Please rebase on the latest version on net-next. > > > > Thanks, will do. I may wait for your cleanup patches to appear, though. > > The v5 of my cleanup is already in the master branch of linux-can-next: > https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git/log/ > > But you might have a conflict on drivers/net/can/Kconfig so better to > wait for the v6 (or apply my patches manually if you are in a hurry). I've pushed Vincent's v6 to linux-can-next/master. Please base your series on that branch. It also contains "can: netlink: allow configuring of fixed bit rates without need for do_set_bittiming callback" regards, 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
