* [PATCH 0/6] CAN FD support
@ 2012-06-18 17:38 Oliver Hartkopp
2012-06-18 19:10 ` Marc Kleine-Budde
0 siblings, 1 reply; 7+ messages in thread
From: Oliver Hartkopp @ 2012-06-18 17:38 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can@vger.kernel.org
Hello Marc,
here's my first real git patch series adding support for CAN with flexible
data rate (CAN FD).
As there were no new remarks to my RFC v5 from 2012-05-28
http://comments.gmane.org/gmane.linux.can/1297
and it's tested and running on my machine for a while now it's IMHO time
for net-next now.
You can also pull the series ;-)
Git is hard for newbies but i gave my very best ...
Best regards,
Oliver
The following changes since commit 4670fd819e7f47392c7c6fc6168ea2857c66d163:
tcp: Get rid of inetpeer special cases. (2012-06-09 01:25:47 -0700)
are available in the git repository at:
git://gitorious.org/~hartkopp/linux-can/ollis-can-next.git canfd
for you to fetch changes up to d55c45913f93ccbd4378195e2d6ca96b2d14573b:
canfd: update documentation according to CAN FD extensions (2012-06-17 21:23:55 +0200)
----------------------------------------------------------------
Oliver Hartkopp (6):
canfd: add new data structures and constants
canfd: add support for CAN FD in PF_CAN core
canfd: add support for CAN FD in CAN_RAW sockets
candev: add/update helpers for CAN FD
vcan: add CAN FD support
canfd: update documentation according to CAN FD extensions
Documentation/networking/can.txt | 154 ++++++++++++++++++++++++++++++++++++--
drivers/net/can/dev.c | 35 ++++++++-
drivers/net/can/vcan.c | 27 +++++--
include/linux/can.h | 55 +++++++++++++-
include/linux/can/core.h | 4 +-
include/linux/can/dev.h | 33 ++++++--
include/linux/can/raw.h | 3 +-
include/linux/if_ether.h | 3 +-
net/can/af_can.c | 116 +++++++++++++++++++++-------
net/can/raw.c | 50 ++++++++++++-
10 files changed, 417 insertions(+), 63 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/6] CAN FD support
2012-06-18 17:38 [PATCH 0/6] CAN FD support Oliver Hartkopp
@ 2012-06-18 19:10 ` Marc Kleine-Budde
2012-06-18 19:14 ` Oliver Hartkopp
0 siblings, 1 reply; 7+ messages in thread
From: Marc Kleine-Budde @ 2012-06-18 19:10 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 928 bytes --]
On 06/18/2012 07:38 PM, Oliver Hartkopp wrote:
> Hello Marc,
>
> here's my first real git patch series adding support for CAN with flexible
> data rate (CAN FD).
>
> As there were no new remarks to my RFC v5 from 2012-05-28
>
> http://comments.gmane.org/gmane.linux.can/1297
>
> and it's tested and running on my machine for a while now it's IMHO time
> for net-next now.
>
> You can also pull the series ;-)
I can pull, but David want's to have a clean tree. So I have to pull and
rebase it on my tree.
> Git is hard for newbies but i gave my very best ...
Once you can use it, you don't want to code without it.
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: 262 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/6] CAN FD support
2012-06-18 19:10 ` Marc Kleine-Budde
@ 2012-06-18 19:14 ` Oliver Hartkopp
2012-06-18 19:27 ` Marc Kleine-Budde
2012-06-19 7:26 ` Wolfgang Grandegger
0 siblings, 2 replies; 7+ messages in thread
From: Oliver Hartkopp @ 2012-06-18 19:14 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can@vger.kernel.org
On 18.06.2012 21:10, Marc Kleine-Budde wrote:
> On 06/18/2012 07:38 PM, Oliver Hartkopp wrote:
>> Hello Marc,
>>
>> here's my first real git patch series adding support for CAN with flexible
>> data rate (CAN FD).
>>
>> As there were no new remarks to my RFC v5 from 2012-05-28
>>
>> http://comments.gmane.org/gmane.linux.can/1297
>>
>> and it's tested and running on my machine for a while now it's IMHO time
>> for net-next now.
>>
>> You can also pull the series ;-)
>
> I can pull, but David want's to have a clean tree. So I have to pull and
> rebase it on my tree.
I created a branch 'canfd' on a clone of *your* can-next.
What's not clean there?
You can pull Daves net-next and then pull the canfd branch, right?
>
>> Git is hard for newbies but i gave my very best ...
>
> Once you can use it, you don't want to code without it.
Yes - it's getting better. Indeed it looks like Thunderbird mangles the mails
when editing the draft mails.
Regards,
Oliver
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/6] CAN FD support
2012-06-18 19:14 ` Oliver Hartkopp
@ 2012-06-18 19:27 ` Marc Kleine-Budde
2012-06-18 19:30 ` Oliver Hartkopp
2012-06-19 7:26 ` Wolfgang Grandegger
1 sibling, 1 reply; 7+ messages in thread
From: Marc Kleine-Budde @ 2012-06-18 19:27 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
On 06/18/2012 09:14 PM, Oliver Hartkopp wrote:
>>> You can also pull the series ;-)
>>
>> I can pull, but David want's to have a clean tree. So I have to pull and
>> rebase it on my tree.
>
>
> I created a branch 'canfd' on a clone of *your* can-next.
No need for that. git pull --rebase works.
>
> What's not clean there?
>
> You can pull Daves net-next and then pull the canfd branch, right?
Yes, but David wants to have a clean linear series of patches, not with
merges in it.
>>> Git is hard for newbies but i gave my very best ...
>>
>> Once you can use it, you don't want to code without it.
> Yes - it's getting better. Indeed it looks like Thunderbird mangles the mails
> when editing the draft mails.
Don't do that :)
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: 262 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/6] CAN FD support
2012-06-18 19:27 ` Marc Kleine-Budde
@ 2012-06-18 19:30 ` Oliver Hartkopp
2012-06-18 19:38 ` Marc Kleine-Budde
0 siblings, 1 reply; 7+ messages in thread
From: Oliver Hartkopp @ 2012-06-18 19:30 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can@vger.kernel.org
On 18.06.2012 21:27, Marc Kleine-Budde wrote:
> On 06/18/2012 09:14 PM, Oliver Hartkopp wrote:
>>>> You can also pull the series ;-)
>>>
>>> I can pull, but David want's to have a clean tree. So I have to pull and
>>> rebase it on my tree.
>>
>>
>> I created a branch 'canfd' on a clone of *your* can-next.
>
> No need for that. git pull --rebase works.
>>
>> What's not clean there?
>>
>> You can pull Daves net-next and then pull the canfd branch, right?
>
> Yes, but David wants to have a clean linear series of patches, not with
> merges in it.
What can i do now to support this?
>
>>>> Git is hard for newbies but i gave my very best ...
>>>
>>> Once you can use it, you don't want to code without it.
>
>> Yes - it's getting better. Indeed it looks like Thunderbird mangles the mails
>> when editing the draft mails.
>
> Don't do that :)
Yep. Just learned that %-[
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/6] CAN FD support
2012-06-18 19:30 ` Oliver Hartkopp
@ 2012-06-18 19:38 ` Marc Kleine-Budde
0 siblings, 0 replies; 7+ messages in thread
From: Marc Kleine-Budde @ 2012-06-18 19:38 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
On 06/18/2012 09:30 PM, Oliver Hartkopp wrote:
> On 18.06.2012 21:27, Marc Kleine-Budde wrote:
>
>> On 06/18/2012 09:14 PM, Oliver Hartkopp wrote:
>>>>> You can also pull the series ;-)
>>>>
>>>> I can pull, but David want's to have a clean tree. So I have to pull and
>>>> rebase it on my tree.
>>>
>>>
>>> I created a branch 'canfd' on a clone of *your* can-next.
>>
>> No need for that. git pull --rebase works.
>>>
>>> What's not clean there?
>>>
>>> You can pull Daves net-next and then pull the canfd branch, right?
>>
>> Yes, but David wants to have a clean linear series of patches, not with
>> merges in it.
>
>
> What can i do now to support this?
No work on your side needed. I'll just rebase all patches on my tree
(and add my S-o-b).
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: 262 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/6] CAN FD support
2012-06-18 19:14 ` Oliver Hartkopp
2012-06-18 19:27 ` Marc Kleine-Budde
@ 2012-06-19 7:26 ` Wolfgang Grandegger
1 sibling, 0 replies; 7+ messages in thread
From: Wolfgang Grandegger @ 2012-06-19 7:26 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: Marc Kleine-Budde, linux-can@vger.kernel.org
On 06/18/2012 09:14 PM, Oliver Hartkopp wrote:
> On 18.06.2012 21:10, Marc Kleine-Budde wrote:
>
>> On 06/18/2012 07:38 PM, Oliver Hartkopp wrote:
>>> Hello Marc,
>>>
>>> here's my first real git patch series adding support for CAN with flexible
>>> data rate (CAN FD).
>>>
>>> As there were no new remarks to my RFC v5 from 2012-05-28
>>>
>>> http://comments.gmane.org/gmane.linux.can/1297
>>>
>>> and it's tested and running on my machine for a while now it's IMHO time
>>> for net-next now.
>>>
>>> You can also pull the series ;-)
>>
>> I can pull, but David want's to have a clean tree. So I have to pull and
>> rebase it on my tree.
>
>
> I created a branch 'canfd' on a clone of *your* can-next.
>
> What's not clean there?
>
> You can pull Daves net-next and then pull the canfd branch, right?
>
>>
>>> Git is hard for newbies but i gave my very best ...
>>
>> Once you can use it, you don't want to code without it.
>
>
> Yes - it's getting better. Indeed it looks like Thunderbird mangles the mails
> when editing the draft mails.
I use the "Toggle Word Wrap" Extension to avoid white space mangling
with Thunderbird and sometimes I even use it to send single patches.
Anyway, especially for a series of patches, "git send-email" is the
better choice.
Wolfgang.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-06-19 7:26 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18 17:38 [PATCH 0/6] CAN FD support Oliver Hartkopp
2012-06-18 19:10 ` Marc Kleine-Budde
2012-06-18 19:14 ` Oliver Hartkopp
2012-06-18 19:27 ` Marc Kleine-Budde
2012-06-18 19:30 ` Oliver Hartkopp
2012-06-18 19:38 ` Marc Kleine-Budde
2012-06-19 7:26 ` Wolfgang Grandegger
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).