mbox

pull-request: can-next 2012-07-20

Message ID 50098706.2080509@pengutronix.de
State Accepted, archived
Delegated to: David Miller
Headers show

Pull-request

git://gitorious.org/linux-can/linux-can-next.git for-davem

Message

Marc Kleine-Budde July 20, 2012, 4:27 p.m. UTC
Hello David,

the fifth pull request for upcoming v3.6 net-next cleans up and
improves the janz-ican3 driver (6 patches by Ira W. Snyder, one by me).
A patch by Steffen Trumtrar adds imx53 support to the flexcan driver.
And another patch by me, which marks the bit timing constant in the CAN
drivers as "const".

regards, Marc

---

The following changes since commit 769162e38b91e1d300752e666260fa6c7b203fbc:

  Merge branch 'net' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (2012-07-19 13:39:27 -0700)

are available in the git repository at:


  git://gitorious.org/linux-can/linux-can-next.git for-davem

for you to fetch changes up to 3b5c6b9e49f78f07ebcd34b38c1185e57a0fd9eb:

  can: janz-ican3: add support for one shot mode (2012-07-20 17:49:05 +0200)

----------------------------------------------------------------
Ira W. Snyder (6):
      can: janz-ican3: remove dead code
      can: janz-ican3: drop invalid skbs
      can: janz-ican3: fix error and byte counters
      can: janz-ican3: fix support for CAN_RAW_RECV_OWN_MSGS
      can: janz-ican3: avoid firmware lockup caused by infinite bus error quota
      can: janz-ican3: add support for one shot mode

Marc Kleine-Budde (2):
      can: mark bittiming_const pointer in struct can_priv as const
      can: janz-ican3: cleanup of ican3_to_can_frame and can_frame_to_ican3

Steffen Trumtrar (1):
      can: flexcan: add 2nd clock to support imx53 and newer

 drivers/net/can/at91_can.c                   |    2 +-
 drivers/net/can/bfin_can.c                   |    2 +-
 drivers/net/can/c_can/c_can.c                |    2 +-
 drivers/net/can/cc770/cc770.c                |    2 +-
 drivers/net/can/flexcan.c                    |   47 +++--
 drivers/net/can/janz-ican3.c                 |  241 ++++++++++++++++++++------
 drivers/net/can/mcp251x.c                    |    2 +-
 drivers/net/can/mscan/mscan.c                |    2 +-
 drivers/net/can/pch_can.c                    |    2 +-
 drivers/net/can/sja1000/sja1000.c            |    2 +-
 drivers/net/can/ti_hecc.c                    |    2 +-
 drivers/net/can/usb/ems_usb.c                |    2 +-
 drivers/net/can/usb/esd_usb2.c               |    2 +-
 drivers/net/can/usb/peak_usb/pcan_usb_core.h |    2 +-
 include/linux/can/dev.h                      |    2 +-
 15 files changed, 226 insertions(+), 88 deletions(-)

Comments

David Miller July 20, 2012, 6:02 p.m. UTC | #1
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 20 Jul 2012 18:27:50 +0200

> Hello David,
> 
> the fifth pull request for upcoming v3.6 net-next cleans up and
> improves the janz-ican3 driver (6 patches by Ira W. Snyder, one by me).
> A patch by Steffen Trumtrar adds imx53 support to the flexcan driver.
> And another patch by me, which marks the bit timing constant in the CAN
> drivers as "const".

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