* upcoming pull reqeust
@ 2013-01-15 20:58 Marc Kleine-Budde
2013-01-19 13:34 ` Oliver Hartkopp
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2013-01-15 20:58 UTC (permalink / raw)
To: linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 2647 bytes --]
Hello,
I'm going to send a pull request to David this week, it will include:
the LED trigger patches by Fabio and Kurt and my Kconfig cleanup. The
usb8-dev driver has some problems with unplug under heavy load, so it
will not be included.
The patches are in the for-davem branch in the linux-can-next repo at
gitorious:
https://gitorious.org/linux-can/linux-can-next/commits/for-davem
The shortlog is:
Fabio Baltieri (7):
can: add tx/rx LED trigger support
can: flexcan: add LED trigger support
can: at91_can: add LED trigger support
can: ti_hecc: add LED trigger support
can: c_can: add LED trigger support
can: mcp251x: add LED trigger support
can: sja1000: add LED trigger support
Kurt Van Dijck (2):
can: export a safe netdev_priv wrapper for candev
can: rename LED trigger name on netdev renames
Marc Kleine-Budde (4):
can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block
can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block
can: Kconfig: switch on all CAN protocolls by default
can: sja1000: correct indention of Kconfig help text
drivers/net/can/Kconfig | 37 +++++++----
drivers/net/can/Makefile | 2 +
drivers/net/can/at91_can.c | 10 +++
drivers/net/can/c_can/Kconfig | 2 +-
drivers/net/can/c_can/c_can.c | 10 +++
drivers/net/can/cc770/Kconfig | 2 +-
drivers/net/can/dev.c | 18 ++++++
drivers/net/can/flexcan.c | 11 ++++
drivers/net/can/led.c | 129 +++++++++++++++++++++++++++++++++++++
drivers/net/can/mcp251x.c | 23 +++++--
drivers/net/can/mscan/Kconfig | 2 +-
drivers/net/can/sja1000/Kconfig | 14 ++--
drivers/net/can/sja1000/sja1000.c | 17 ++++-
drivers/net/can/softing/Kconfig | 2 +-
drivers/net/can/ti_hecc.c | 10 +++
drivers/net/can/usb/Kconfig | 2 +-
include/linux/can/dev.h | 11 ++++
include/linux/can/led.h | 51 +++++++++++++++
net/can/Kconfig | 13 ++--
19 files changed, 329 insertions(+), 37 deletions(-)
create mode 100644 drivers/net/can/led.c
create mode 100644 include/linux/can/led.h
Comments, any missing patches or {Reviewed,Acked,Tested}-by?
regards,
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: 263 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: upcoming pull reqeust
2013-01-15 20:58 upcoming pull reqeust Marc Kleine-Budde
@ 2013-01-19 13:34 ` Oliver Hartkopp
2013-01-22 22:03 ` Marc Kleine-Budde
0 siblings, 1 reply; 6+ messages in thread
From: Oliver Hartkopp @ 2013-01-19 13:34 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can@vger.kernel.org
Can you add my patchset
"CAN sk_buff and can-gw enhancements"
and Bernds
"[PATCH v11] usb_8dev: Add support for USB2CAN interface from 8 devices"
and the omitted LED support for the usb_8dev driver from Fabio too?
Regards,
Oliver
On 15.01.2013 21:58, Marc Kleine-Budde wrote:
> Hello,
>
> I'm going to send a pull request to David this week, it will include:
> the LED trigger patches by Fabio and Kurt and my Kconfig cleanup. The
> usb8-dev driver has some problems with unplug under heavy load, so it
> will not be included.
>
> The patches are in the for-davem branch in the linux-can-next repo at
> gitorious:
>
> https://gitorious.org/linux-can/linux-can-next/commits/for-davem
>
> The shortlog is:
>
> Fabio Baltieri (7):
> can: add tx/rx LED trigger support
> can: flexcan: add LED trigger support
> can: at91_can: add LED trigger support
> can: ti_hecc: add LED trigger support
> can: c_can: add LED trigger support
> can: mcp251x: add LED trigger support
> can: sja1000: add LED trigger support
>
> Kurt Van Dijck (2):
> can: export a safe netdev_priv wrapper for candev
> can: rename LED trigger name on netdev renames
>
> Marc Kleine-Budde (4):
> can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block
> can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block
> can: Kconfig: switch on all CAN protocolls by default
> can: sja1000: correct indention of Kconfig help text
>
> drivers/net/can/Kconfig | 37 +++++++----
> drivers/net/can/Makefile | 2 +
> drivers/net/can/at91_can.c | 10 +++
> drivers/net/can/c_can/Kconfig | 2 +-
> drivers/net/can/c_can/c_can.c | 10 +++
> drivers/net/can/cc770/Kconfig | 2 +-
> drivers/net/can/dev.c | 18 ++++++
> drivers/net/can/flexcan.c | 11 ++++
> drivers/net/can/led.c | 129 +++++++++++++++++++++++++++++++++++++
> drivers/net/can/mcp251x.c | 23 +++++--
> drivers/net/can/mscan/Kconfig | 2 +-
> drivers/net/can/sja1000/Kconfig | 14 ++--
> drivers/net/can/sja1000/sja1000.c | 17 ++++-
> drivers/net/can/softing/Kconfig | 2 +-
> drivers/net/can/ti_hecc.c | 10 +++
> drivers/net/can/usb/Kconfig | 2 +-
> include/linux/can/dev.h | 11 ++++
> include/linux/can/led.h | 51 +++++++++++++++
> net/can/Kconfig | 13 ++--
> 19 files changed, 329 insertions(+), 37 deletions(-)
> create mode 100644 drivers/net/can/led.c
> create mode 100644 include/linux/can/led.h
>
> Comments, any missing patches or {Reviewed,Acked,Tested}-by?
>
> regards,
> Marc
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: upcoming pull reqeust
2013-01-19 13:34 ` Oliver Hartkopp
@ 2013-01-22 22:03 ` Marc Kleine-Budde
2013-01-25 15:55 ` Oliver Hartkopp
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2013-01-22 22:03 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 3463 bytes --]
On 01/19/2013 02:34 PM, Oliver Hartkopp wrote:
> Can you add my patchset
>
> "CAN sk_buff and can-gw enhancements"
>
> and Bernds
>
> "[PATCH v11] usb_8dev: Add support for USB2CAN interface from 8 devices"
>
> and the omitted LED support for the usb_8dev driver from Fabio too?
Done.
The patches are in the for-davem branch in the linux-can-next repo at
gitorious:
https://gitorious.org/linux-can/linux-can-next/commits/for-davem
Bernd Krumboeck (2):
can: usb_8dev: Add support for USB2CAN interface from 8 devices
can: usb_8dev: add LED trigger support
Fabio Baltieri (7):
can: add tx/rx LED trigger support
can: flexcan: add LED trigger support
can: at91_can: add LED trigger support
can: ti_hecc: add LED trigger support
can: c_can: add LED trigger support
can: mcp251x: add LED trigger support
can: sja1000: add LED trigger support
Kurt Van Dijck (2):
can: export a safe netdev_priv wrapper for candev
can: rename LED trigger name on netdev renames
Marc Kleine-Budde (4):
can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block
can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block
can: Kconfig: switch on all CAN protocolls by default
can: sja1000: correct indention of Kconfig help text
Oliver Hartkopp (4):
can: add private data space for CAN sk_buffs
can: gw: make routing to the incoming CAN interface configurable
can: gw: add a variable limit for CAN frame routings
can: gw: indicate and count deleted frames due to misconfiguration
drivers/net/can/Kconfig | 37 +-
drivers/net/can/Makefile | 2 +
drivers/net/can/at91_can.c | 10 +
drivers/net/can/c_can/Kconfig | 2 +-
drivers/net/can/c_can/c_can.c | 10 +
drivers/net/can/cc770/Kconfig | 2 +-
drivers/net/can/dev.c | 26 +-
drivers/net/can/flexcan.c | 11 +
drivers/net/can/led.c | 124 +++++
drivers/net/can/mcp251x.c | 23 +-
drivers/net/can/mscan/Kconfig | 2 +-
drivers/net/can/sja1000/Kconfig | 14 +-
drivers/net/can/sja1000/sja1000.c | 17 +-
drivers/net/can/slcan.c | 8 +-
drivers/net/can/softing/Kconfig | 2 +-
drivers/net/can/ti_hecc.c | 10 +
drivers/net/can/usb/Kconfig | 8 +-
drivers/net/can/usb/Makefile | 1 +
drivers/net/can/usb/usb_8dev.c | 1033 +++++++++++++++++++++++++++++++++++++
include/linux/can/dev.h | 11 +
include/linux/can/led.h | 51 ++
include/linux/can/skb.h | 35 ++
include/uapi/linux/can/gw.h | 2 +
net/can/Kconfig | 13 +-
net/can/bcm.c | 12 +-
net/can/gw.c | 74 ++-
net/can/raw.c | 8 +-
27 files changed, 1488 insertions(+), 60 deletions(-)
create mode 100644 drivers/net/can/led.c
create mode 100644 drivers/net/can/usb/usb_8dev.c
create mode 100644 include/linux/can/led.h
create mode 100644 include/linux/can/skb.h
Comments?
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: 263 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: upcoming pull reqeust
2013-01-22 22:03 ` Marc Kleine-Budde
@ 2013-01-25 15:55 ` Oliver Hartkopp
2013-01-26 16:09 ` Marc Kleine-Budde
2013-01-26 16:35 ` Marc Kleine-Budde
0 siblings, 2 replies; 6+ messages in thread
From: Oliver Hartkopp @ 2013-01-25 15:55 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can@vger.kernel.org
On 22.01.2013 23:03, Marc Kleine-Budde wrote:
> The patches are in the for-davem branch in the linux-can-next repo at
> gitorious:
>
> https://gitorious.org/linux-can/linux-can-next/commits/for-davem
>
> Bernd Krumboeck (2):
> can: usb_8dev: Add support for USB2CAN interface from 8 devices
> can: usb_8dev: add LED trigger support
>
> Fabio Baltieri (7):
> can: add tx/rx LED trigger support
> can: flexcan: add LED trigger support
> can: at91_can: add LED trigger support
> can: ti_hecc: add LED trigger support
> can: c_can: add LED trigger support
> can: mcp251x: add LED trigger support
> can: sja1000: add LED trigger support
>
> Kurt Van Dijck (2):
> can: export a safe netdev_priv wrapper for candev
> can: rename LED trigger name on netdev renames
>
> Marc Kleine-Budde (4):
> can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block
> can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block
> can: Kconfig: switch on all CAN protocolls by default
> can: sja1000: correct indention of Kconfig help text
>
> Oliver Hartkopp (4):
> can: add private data space for CAN sk_buffs
> can: gw: make routing to the incoming CAN interface configurable
> can: gw: add a variable limit for CAN frame routings
> can: gw: indicate and count deleted frames due to misconfiguration
>
>
> Comments?
>
What's you plan when to send the pull request to Dave?
Btw. have you seen the 3 c_can fixes from Olivier Sobrie for the net/stable
tree from 2013-01-18? They all look correct.
Regards,
Oliver
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: upcoming pull reqeust
2013-01-25 15:55 ` Oliver Hartkopp
@ 2013-01-26 16:09 ` Marc Kleine-Budde
2013-01-26 16:35 ` Marc Kleine-Budde
1 sibling, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2013-01-26 16:09 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
On 01/25/2013 04:55 PM, Oliver Hartkopp wrote:
[...]
> What's you plan when to send the pull request to Dave?
Done,
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: 263 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: upcoming pull reqeust
2013-01-25 15:55 ` Oliver Hartkopp
2013-01-26 16:09 ` Marc Kleine-Budde
@ 2013-01-26 16:35 ` Marc Kleine-Budde
1 sibling, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2013-01-26 16:35 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
On 01/25/2013 04:55 PM, Oliver Hartkopp wrote:
[...]
> Btw. have you seen the 3 c_can fixes from Olivier Sobrie for the net/stable
> tree from 2013-01-18? They all look correct.
Done
Thanks for poking me,
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: 263 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-26 16:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-15 20:58 upcoming pull reqeust Marc Kleine-Budde
2013-01-19 13:34 ` Oliver Hartkopp
2013-01-22 22:03 ` Marc Kleine-Budde
2013-01-25 15:55 ` Oliver Hartkopp
2013-01-26 16:09 ` Marc Kleine-Budde
2013-01-26 16:35 ` Marc Kleine-Budde
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).