From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Nikita Edward Baruzdin <nebaruzdin@gmail.com>,
Oliver Hartkopp <socketcan@hartkopp.net>
Cc: "linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Subject: Re: [iproute2 1/2] Update CAN netlink header
Date: Tue, 22 Jul 2014 16:23:29 +0200 [thread overview]
Message-ID: <53CE73E1.7060301@pengutronix.de> (raw)
In-Reply-To: <1406038184.9500.2.camel@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1912 bytes --]
On 07/22/2014 04:09 PM, Nikita Edward Baruzdin wrote:
> On Mon, 2014-07-21 at 19:51 +0200, Oliver Hartkopp wrote:
>> Hello Nikita,
>>
>> On 21.07.2014 11:43, Nikita Edward Baruzdin wrote:
>>> Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
>>> ---
>>> include/linux/can/netlink.h | 12 ++++++++----
>>
>>
>>> * CAN device statistics
>>> @@ -122,9 +124,11 @@ enum {
>>> IFLA_CAN_RESTART_MS,
>>> IFLA_CAN_RESTART,
>>> IFLA_CAN_BERR_COUNTER,
>>> + IFLA_CAN_DATA_BITTIMING,
>>> + IFLA_CAN_DATA_BITTIMING_CONST,
>>> __IFLA_CAN_MAX
>>> };
>>
>> This change has already been applied to the iproute2 git repository from
>> Stephen Hemminger:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/
>>
>> See:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/diff/include/linux/can/netlink.h?id=e4d5edba68970124c5ce245a11a5c5cd4dde9ae1
>>
>> The best is, to wait until Stephen has pulled the Linux headers into his tree.
>> This will usually happen when the merge window for the Kernel 3.17(!) is
>> closed - e.g. in 4-6 weeks from now.
>>
>> After the kernel header update in the iproute2 git repository it makes sense
>> to post your patch 2/2 as
>>
>> iproute2: add support for CAN presume-ack feature
>>
>> and send this simultaneously on linux-can and linux-netdev ML.
>>
>> So let's wait for Stephen updating his iproute2 tree ...
>>
>> Thanks,
>> Oliver
>>
>
> Got it, I was looking at linux-can/iproute2 tree.
>
> And what about libsocketcan patches?
I've just applied them to libsocketcan master.
Thnx,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]
next prev parent reply other threads:[~2014-07-22 14:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-21 9:43 CAN_CTRLMODE_PRESUME_ACK follow-up patches Nikita Edward Baruzdin
2014-07-21 9:43 ` [iproute2 1/2] Update CAN netlink header Nikita Edward Baruzdin
2014-07-21 17:51 ` Oliver Hartkopp
2014-07-22 14:09 ` Nikita Edward Baruzdin
2014-07-22 14:23 ` Marc Kleine-Budde [this message]
2014-07-21 9:43 ` [iproute2 2/2] iplink: Support for CAN presume-ack feature Nikita Edward Baruzdin
2014-07-21 9:43 ` [libsocketcan 1/2] Update CAN netlink header Nikita Edward Baruzdin
2014-07-21 9:43 ` [libsocketcan 2/2] Update can_set_ctrlmode() documentation Nikita Edward Baruzdin
2014-07-22 14:26 ` Marc Kleine-Budde
2014-07-22 14:42 ` Nikita Edward Baruzdin
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=53CE73E1.7060301@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=nebaruzdin@gmail.com \
--cc=socketcan@hartkopp.net \
/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).