* pull-request: can-next 2014-02-12
@ 2014-02-12 10:15 Marc Kleine-Budde
2014-02-13 23:16 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Marc Kleine-Budde @ 2014-02-12 10:15 UTC (permalink / raw)
To: netdev; +Cc: David Miller, linux-can@vger.kernel.org, kernel@pengutronix.de
[-- Attachment #1: Type: text/plain, Size: 2769 bytes --]
Hello David,
this is a pull request of eight patches for net-next/master.
Florian Vaussard contributed a series that merged the sja1000 of_platform
into the platform driver. The of_platform driver is finally removed.
Stephane Grosjean supplied a patch to allocate CANFD skbs. In a patch
by Uwe Kleine-König another missing copyright information was added to
a userspace header. And a patch by Yoann DI RUZZA that adds listen only
mode to the at91_can driver.
regards,
Marc
---
The following changes since commit 77d143de75812596a58d126606f42d1214e09dde:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml (2014-01-26 11:06:16 -0800)
are available in the git repository at:
git://gitorious.org/linux-can/linux-can-next.git tags/linux-can-next-for-3.15-20140212
for you to fetch changes up to 17a50ee4bd47bdba94546e0526fc9ce93dc77d5e:
can: at91_can: add listen only mode (2014-02-11 09:55:44 +0100)
----------------------------------------------------------------
linux-can-next-for-3.15-20140212
----------------------------------------------------------------
Florian Vaussard (5):
can: sja1000: convert printk to use netdev API
can: sja1000: platform: use devm_* APIs
can: sja1000: fuse of_platform into platform
Documentation: devicetree: sja1000: add reg-io-width binding
can: sja1000: of: add reg-io-width property for 8, 16 and 32-bit register access
Stephane Grosjean (1):
can: add ability to allocate CANFD frame in skb data
Uwe Kleine-König (1):
can: add explicit copyrights to can userspace header
Yoann DI RUZZA (1):
can: at91_can: add listen only mode
.../devicetree/bindings/net/can/sja1000.txt | 4 +
drivers/net/can/at91_can.c | 9 +-
drivers/net/can/dev.c | 24 +++
drivers/net/can/sja1000/Kconfig | 13 +-
drivers/net/can/sja1000/Makefile | 1 -
drivers/net/can/sja1000/sja1000.c | 3 +-
drivers/net/can/sja1000/sja1000_of_platform.c | 220 ---------------------
drivers/net/can/sja1000/sja1000_platform.c | 194 ++++++++++++------
include/linux/can/dev.h | 2 +
include/uapi/linux/can.h | 32 +++
10 files changed, 206 insertions(+), 296 deletions(-)
delete mode 100644 drivers/net/can/sja1000/sja1000_of_platform.c
--
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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: pull-request: can-next 2014-02-12
2014-02-12 10:15 Marc Kleine-Budde
@ 2014-02-13 23:16 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-02-13 23:16 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 12 Feb 2014 11:15:19 +0100
> this is a pull request of eight patches for net-next/master.
>
> Florian Vaussard contributed a series that merged the sja1000 of_platform
> into the platform driver. The of_platform driver is finally removed.
> Stephane Grosjean supplied a patch to allocate CANFD skbs. In a patch
> by Uwe Kleine-König another missing copyright information was added to
> a userspace header. And a patch by Yoann DI RUZZA that adds listen only
> mode to the at91_can driver.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 4+ messages in thread
* pull-request: can-next 2014-02-12
@ 2014-03-07 9:45 Marc Kleine-Budde
2014-03-07 22:10 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Marc Kleine-Budde @ 2014-03-07 9:45 UTC (permalink / raw)
To: netdev; +Cc: David Miller, linux-can@vger.kernel.org, kernel@pengutronix.de
[-- Attachment #1: Type: text/plain, Size: 2727 bytes --]
Hello David,
this is a pull request of twelve patches for net-next/master.
Alexander Shiyan contributes two patches for the mcp251x, one making
the driver more quiet and the other one improves the compile time
coverage by removing the #ifdef CONFIG_PM_SLEEP. Then two patches for
the flexcan driver by me, one removing the #ifdef CONFIG_PM_SLEEP, too,
the other one making use of platform_get_device_id(). Another patch by
me which converts the janz-ican3 driver to use netdev_<level>(). The
remaining 7 patches are by Oliver Hartkopp, they add CAN FD support to
the netlink configuration interface.
regards,
Marc
---
The following changes since commit f3253339a47ff3690ce52e2acd95ec295f8521b3:
bonding: options handling cleanup (2014-03-06 16:08:52 -0500)
are available in the git repository at:
git://gitorious.org/linux-can/linux-can-next.git tags/linux-can-next-for-3.15-20140307
for you to fetch changes up to dd22586dec4c1444608affd83b1fedd520280ab4:
can: add bittiming check at interface open for CAN FD (2014-03-07 09:18:23 +0100)
----------------------------------------------------------------
linux-can-next-for-3.15-20140307
----------------------------------------------------------------
Alexander Shiyan (2):
can: mcp251x: Make driver more quiet
can: mcp251x: Remove #ifdef CONFIG_PM_SLEEP
Marc Kleine-Budde (3):
can: flexcan: Remove #ifdef CONFIG_PM_SLEEP
can: flexcan: make use of platform_get_device_id()
can: janz-ican3: convert dev_<level> printing to netdev_<level>
Oliver Hartkopp (7):
can: preserve skbuff protocol in can_put_echo_skb
can: only send bitrate data via netlink when available
can: move sanity check for bitrate and tq into can_get_bittiming
can: provide a separate bittiming_const parameter to bittiming functions
can: introduce the data bitrate configuration for CAN FD
can: allow to change the device mtu for CAN FD capable devices
can: add bittiming check at interface open for CAN FD
drivers/net/can/dev.c | 159 ++++++++++++++++++++++++++++++---------
drivers/net/can/flexcan.c | 10 +--
drivers/net/can/janz-ican3.c | 64 ++++++++--------
drivers/net/can/mcp251x.c | 17 ++---
include/linux/can/dev.h | 7 +-
include/uapi/linux/can/netlink.h | 3 +
6 files changed, 172 insertions(+), 88 deletions(-)
--
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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: pull-request: can-next 2014-02-12
2014-03-07 9:45 pull-request: can-next 2014-02-12 Marc Kleine-Budde
@ 2014-03-07 22:10 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-03-07 22:10 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 07 Mar 2014 10:45:51 +0100
> this is a pull request of twelve patches for net-next/master.
>
> Alexander Shiyan contributes two patches for the mcp251x, one making
> the driver more quiet and the other one improves the compile time
> coverage by removing the #ifdef CONFIG_PM_SLEEP. Then two patches for
> the flexcan driver by me, one removing the #ifdef CONFIG_PM_SLEEP, too,
> the other one making use of platform_get_device_id(). Another patch by
> me which converts the janz-ican3 driver to use netdev_<level>(). The
> remaining 7 patches are by Oliver Hartkopp, they add CAN FD support to
> the netlink configuration interface.
...
> git://gitorious.org/linux-can/linux-can-next.git tags/linux-can-next-for-3.15-20140307
Pulled, thank you Marc.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-07 22:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-07 9:45 pull-request: can-next 2014-02-12 Marc Kleine-Budde
2014-03-07 22:10 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-02-12 10:15 Marc Kleine-Budde
2014-02-13 23:16 ` David Miller
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).