Hello David, this is a pull request of a two patches for net-next.
The first patch is by Tomas Krcka, he fixes the (currently unused)
register address for acceptance filters. Oliver Hartkopp contributes a
patch for the cangw, where an optional UID is added to reference
routing jobs.
regards,
Marc
---
The following changes since commit 941742f49762ba4c908510f036b09a46c1b14513:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2015-06-08
20:06:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
tags/linux-can-next-for-4.2-20150609
for you to fetch changes up to dd895d7f21b244e7fd4c7477697e274de7e44ecb:
can: cangw: introduce optional uid to reference created routing jobs
(2015-06-09 09:39:49 +0200)
----------------------------------------------------------------
linux-can-next-for-4.2-20150609
----------------------------------------------------------------
Oliver Hartkopp (1):
can: cangw: introduce optional uid to reference created routing jobs
Tomas Krcka (1):
can: mcp251x: use correct register address for acceptance filters
drivers/net/can/spi/mcp251x.c | 9 +++---
include/uapi/linux/can/gw.h | 5 ++++
net/can/gw.c | 68 +++++++++++++++++++++++++++++++++++--------
3 files changed, 66 insertions(+), 16 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 |
signature.asc
Description: OpenPGP digital signature
