From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Vincent Mailhol <vincent.mailhol@gmail.com>
Cc: Max Staudt <max@enpas.org>,
Wolfgang Grandegger <wg@grandegger.com>,
linux-can@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Oliver Neukum <oneukum@suse.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v7] can, tty: can327 CAN/ldisc driver for ELM327 based OBD-II adapters
Date: Sat, 11 Jun 2022 17:28:00 +0200 [thread overview]
Message-ID: <20220611152800.3brt52riunli7fq3@pengutronix.de> (raw)
In-Reply-To: <CAMZ6RqLb3irjBrpiOv23Hg6vVpzK4d31Pvat2AOS3EC0+e_=3A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-06-11 15:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-02 21:35 [PATCH v7] can, tty: can327 CAN/ldisc driver for ELM327 based OBD-II adapters Max Staudt
2022-06-03 15:12 ` Vincent Mailhol
2022-06-03 15:47 ` Vincent Mailhol
2022-06-11 13:16 ` Max Staudt
2022-06-11 13:31 ` Marc Kleine-Budde
2022-06-11 13:15 ` Max Staudt
2022-06-11 13:36 ` Marc Kleine-Budde
2022-06-11 14:17 ` Max Staudt
2022-06-11 14:20 ` Marc Kleine-Budde
2022-06-11 14:42 ` Vincent Mailhol
2022-06-11 15:28 ` Marc Kleine-Budde [this message]
2022-06-11 16:41 ` Max Staudt
2022-06-12 1:33 ` Vincent Mailhol
2022-06-12 12:03 ` Max Staudt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220611152800.3brt52riunli7fq3@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=max@enpas.org \
--cc=oneukum@suse.com \
--cc=vincent.mailhol@gmail.com \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).