| Message ID | 52FB49B7.8090403@pengutronix.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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