mbox

pull-request: can 2015-03-09

Message ID 1425893781-10867-1-git-send-email-mkl@pengutronix.de
State Accepted, archived
Delegated to: David Miller
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.0-20150309

Message

Marc Kleine-Budde March 9, 2015, 9:36 a.m. UTC
Hello David,

this is a pull request for net/master for the 4.0 release cycle, it consists of
6 patches:

A patch by Oliver Hartkopp fixes a long outstanding bug in the infrastructure,
which leads to skb_under_panics when CAN interfaces are used by AF_PACKET
sockets e.g. by dhclient. Stephane Grosjean contributes a patch for the
peak_usb driver which adds a missing initialization. Two patches by Ahmed S.
Darwish fix problems in the kvaser_usb driver. Followed by two patches by
myself, updating the MAINTAINERS file.

regards,
Marc
---

The following changes since commit c247f0534cc5a5a547a343903f42295a471844e2:

  ip: fix error queue empty skb handling (2015-03-08 23:01:54 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.0-20150309

for you to fetch changes up to ee2daa00fbe62a491446d3385542d43be233d81c:

  MAINTAINERS: add Marc Kleine-Budde as co maintinaer for CAN networking layer (2015-03-09 10:22:45 +0100)

----------------------------------------------------------------
linux-can-fixes-for-4.0-20150309

----------------------------------------------------------------
Ahmed S. Darwish (2):
      can: kvaser_usb: Avoid double free on URB submission failures
      can: kvaser_usb: Read all messages in a bulk-in URB buffer

Marc Kleine-Budde (2):
      MAINTAINERS: linux-can moved to github
      MAINTAINERS: add Marc Kleine-Budde as co maintinaer for CAN networking layer

Oliver Hartkopp (1):
      can: add missing initialisations in CAN related skbuffs

Stephane Grosjean (1):
      can: peak_usb: fix missing ctrlmode_ init for every dev

 MAINTAINERS                                |  5 ++--
 drivers/net/can/dev.c                      |  8 +++++
 drivers/net/can/usb/kvaser_usb.c           | 48 +++++++++++++++++++-----------
 drivers/net/can/usb/peak_usb/pcan_usb_fd.c |  4 +++
 net/can/af_can.c                           |  3 ++
 5 files changed, 49 insertions(+), 19 deletions(-)


--
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

Comments

David Miller March 9, 2015, 7:41 p.m. UTC | #1
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon,  9 Mar 2015 10:36:15 +0100

> this is a pull request for net/master for the 4.0 release cycle, it consists of
> 6 patches:
> 
> A patch by Oliver Hartkopp fixes a long outstanding bug in the infrastructure,
> which leads to skb_under_panics when CAN interfaces are used by AF_PACKET
> sockets e.g. by dhclient. Stephane Grosjean contributes a patch for the
> peak_usb driver which adds a missing initialization. Two patches by Ahmed S.
> Darwish fix problems in the kvaser_usb driver. Followed by two patches by
> myself, updating the MAINTAINERS file.

Applied, 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