| Message ID | 5326C253.2080102@pengutronix.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 81AA72C010C for <patchwork-incoming@ozlabs.org>; Mon, 17 Mar 2014 20:37:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932579AbaCQJhh (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 17 Mar 2014 05:37:37 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:57264 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932573AbaCQJhf (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 17 Mar 2014 05:37:35 -0400 Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=bjornoya.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from <mkl@pengutronix.de>) id 1WPTz6-0003rm-Aw; Mon, 17 Mar 2014 10:37:28 +0100 Received: from [IPv6:2001:6f8:105b:1122:5e51:4fff:fed6:c770] (unknown [IPv6:2001:6f8:105b:1122:5e51:4fff:fed6:c770]) (using TLSv1 with cipher ECDHE-ECDSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: frogger) by bjornoya.do.blackshift.org (Postfix) with ESMTPSA id 6D3075E93C; Mon, 17 Mar 2014 10:37:27 +0100 (CET) Message-ID: <5326C253.2080102@pengutronix.de> Date: Mon, 17 Mar 2014 10:37:23 +0100 From: Marc Kleine-Budde <mkl@pengutronix.de> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.3.0 MIME-Version: 1.0 To: netdev@vger.kernel.org CC: David Miller <davem@davemloft.net>, "linux-can@vger.kernel.org" <linux-can@vger.kernel.org>, "kernel@pengutronix.de" <kernel@pengutronix.de> Subject: pull-request: can-next 2014-03-17 X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VaiQuPpAbRHh5oWFlN6I0p9hbEqBi16Tm" X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Hello David, this is a pull request of three patches for net-next/master. It consists of a patch by Oliver Hartkopp, which unifies the MTU settings for CAN interfaces. A patch by Christopher R. Baker populates netdev::dev_id for udev discrimination for multi interface CAN devices. Alexander Shiyan contributes a patch for the mcp251x driver which fixes the regulators operation if CONFIG_REGULATOR is not enabled. Marc --- The following changes since commit e7ef085d0a9dc1cc72e7d8108ed3b4e1a5e8d938: Merge branch 'napi_budget_zero' (2014-03-14 22:53:35 -0400) are available in the git repository at: git://gitorious.org/linux-can/linux-can-next.git tags/linux-can-next-for-3.15-20140317 for you to fetch changes up to 76aeec83e448478838eec868066dda33049d1288: can: mcp251x: Fix regulators operation without CONFIG_REGULATOR (2014-03-17 09:20:17 +0100) ---------------------------------------------------------------- linux-can-next-for-3.15-20140317 ---------------------------------------------------------------- Alexander Shiyan (1): can: mcp251x: Fix regulators operation without CONFIG_REGULATOR Christopher R. Baker (1): can: populate netdev::dev_id for udev discrimination Oliver Hartkopp (1): can: Unify MTU settings for CAN interfaces drivers/net/can/at91_can.c | 1 + drivers/net/can/bfin_can.c | 1 + drivers/net/can/c_can/c_can.c | 1 + drivers/net/can/cc770/cc770.c | 1 + drivers/net/can/flexcan.c | 1 + drivers/net/can/grcan.c | 1 + drivers/net/can/janz-ican3.c | 1 + drivers/net/can/mcp251x.c | 5 +++-- drivers/net/can/mscan/mscan.c | 7 ++++--- drivers/net/can/pch_can.c | 1 + drivers/net/can/sja1000/ems_pci.c | 1 + drivers/net/can/sja1000/ems_pcmcia.c | 1 + drivers/net/can/sja1000/kvaser_pci.c | 1 + drivers/net/can/sja1000/peak_pci.c | 1 + drivers/net/can/sja1000/peak_pcmcia.c | 1 + drivers/net/can/sja1000/plx_pci.c | 1 + drivers/net/can/sja1000/sja1000.c | 7 ++++--- drivers/net/can/slcan.c | 6 ++++++ drivers/net/can/softing/softing_main.c | 2 ++ drivers/net/can/ti_hecc.c | 1 + drivers/net/can/usb/ems_usb.c | 1 + drivers/net/can/usb/esd_usb2.c | 2 ++ drivers/net/can/usb/kvaser_usb.c | 2 ++ drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 ++ drivers/net/can/usb/usb_8dev.c | 1 + 25 files changed, 42 insertions(+), 8 deletions(-)