* pull-request: can-next 2015-05-06
@ 2015-05-06 21:21 Marc Kleine-Budde
2015-05-10 2:13 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-05-06 21:21 UTC (permalink / raw)
To: netdev; +Cc: davem, kernel, linux-can, David Jander
[-- Attachment #1: Type: text/plain, Size: 2766 bytes --]
Hello David,
this is a pull request of a seven patches for net-next/master.
Andreas Gröger contributes two patches for the janz-ican3 driver. In
the first patch, the documentation for already existing sysfs entries
is added, the second patch adds support for another module/firmware
variant. A patch by Shawn Landden makes the padding in the struct
can_frame explicit. The next 4 patches target the flexcan driver, the
first one is by David Jander adding some documentation, the reaming
three by me add more documentation and two small code cleanups.
regards,
Marc
---
The following changes since commit 239fb791d4ee194740e69fe9694f58ec404d1689:
vxlan: Correctly set flow*i_mark and flow4i_proto in route lookups (2015-05-05 19:37:54 -0400)
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-20150506
for you to fetch changes up to 10d089bd4b289cbe08d2565f34e030c8980682f4:
can: flexcan: replace open coded "mailbox code" by proper define (2015-05-06 22:57:27 +0200)
----------------------------------------------------------------
linux-can-next-for-4.2-20150506
----------------------------------------------------------------
Andreas Gröger (2):
can: janz-ican3: add documentation for existing sysfs entries
can: janz-ican3: add support for CAL/CANopen firmware
David Jander (1):
can: flexcan: add MB/FIFO specific column to comment table of IP versions
Marc Kleine-Budde (3):
can: flexcan: add documentation about mailbox organization
can: flexcan: rename struct flexcan_regs::crl2 -> ctrl2
can: flexcan: replace open coded "mailbox code" by proper define
Shawn Landden (1):
can.h: make padding given by gcc explicit
.../ABI/testing/sysfs-bus-pci-drivers-janz-cmodio | 8 ++
.../ABI/testing/sysfs-class-net-janz-ican3 | 19 ++++
Documentation/networking/can.txt | 3 +
drivers/mfd/janz-cmodio.c | 4 +
drivers/net/can/flexcan.c | 53 +++++----
drivers/net/can/janz-ican3.c | 125 +++++++++++++++------
include/uapi/linux/can.h | 6 +
7 files changed, 159 insertions(+), 59 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio
create mode 100644 Documentation/ABI/testing/sysfs-class-net-janz-ican3
--
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: 801 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2015-05-06
2015-05-06 21:21 pull-request: can-next 2015-05-06 Marc Kleine-Budde
@ 2015-05-10 2:13 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2015-05-10 2:13 UTC (permalink / raw)
To: mkl; +Cc: netdev, kernel, linux-can, david
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 6 May 2015 23:21:06 +0200
> this is a pull request of a seven patches for net-next/master.
>
> Andreas Gröger contributes two patches for the janz-ican3 driver. In
> the first patch, the documentation for already existing sysfs entries
> is added, the second patch adds support for another module/firmware
> variant. A patch by Shawn Landden makes the padding in the struct
> can_frame explicit. The next 4 patches target the flexcan driver, the
> first one is by David Jander adding some documentation, the reaming
> three by me add more documentation and two small code cleanups.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2015-05-06
2015-08-20 12:13 Marc Kleine-Budde
@ 2015-08-23 23:29 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2015-08-23 23:29 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel, david
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 20 Aug 2015 14:13:53 +0200
> this is a pull request of a two patches for net-next.
>
> The first patch is by Nik Nyby and fixes a typo in a function name. The
> second patch by Lucas Stach demotes register output to debug level.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 6+ messages in thread
* pull-request: can-next 2015-05-06
@ 2015-08-20 12:13 Marc Kleine-Budde
2015-08-23 23:29 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-08-20 12:13 UTC (permalink / raw)
To: netdev; +Cc: linux-can, davem, kernel, David Jander
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
Hello David,
this is a pull request of a two patches for net-next.
The first patch is by Nik Nyby and fixes a typo in a function name. The
second patch by Lucas Stach demotes register output to debug level.
regards,
Marc
---
The following changes since commit 824e7383e92815cb591793c74cc836aa5165f7f8:
lwtunnel: Fix the sparse warnings in fib_encap_match (2015-08-19 17:37:51 -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.3-20150820
for you to fetch changes up to 7a4b6c860e7268a79545c30882928b234dd1655d:
can: flexcan: demote register output to debug level (2015-08-20 10:52:54 +0200)
----------------------------------------------------------------
linux-can-next-for-4.3-20150820
----------------------------------------------------------------
Lucas Stach (1):
can: flexcan: demote register output to debug level
Nik Nyby (1):
can: gs_usb: Fix typo in function name
drivers/net/can/flexcan.c | 2 +-
drivers/net/can/usb/gs_usb.c | 8 ++++----
2 files changed, 5 insertions(+), 5 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: 455 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2015-05-06
2015-06-09 7:45 Marc Kleine-Budde
@ 2015-06-11 4:56 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2015-06-11 4:56 UTC (permalink / raw)
To: mkl; +Cc: netdev, david, kernel, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 9 Jun 2015 09:45:29 +0200
> 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.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 6+ messages in thread
* pull-request: can-next 2015-05-06
@ 2015-06-09 7:45 Marc Kleine-Budde
2015-06-11 4:56 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-06-09 7:45 UTC (permalink / raw)
To: netdev; +Cc: David Jander, davem, kernel, linux-can
[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]
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 |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-08-23 23:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-06 21:21 pull-request: can-next 2015-05-06 Marc Kleine-Budde
2015-05-10 2:13 ` David Miller
2015-06-09 7:45 Marc Kleine-Budde
2015-06-11 4:56 ` David Miller
2015-08-20 12:13 Marc Kleine-Budde
2015-08-23 23:29 ` 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).