From patchwork Tue Jul 17 07:50:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 171352 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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 6308C2C008F for ; Tue, 17 Jul 2012 17:50:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857Ab2GQHuv (ORCPT ); Tue, 17 Jul 2012 03:50:51 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:34493 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751888Ab2GQHut (ORCPT ); Tue, 17 Jul 2012 03:50:49 -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 ) id 1Sr2YP-0006Ny-HO; Tue, 17 Jul 2012 09:50:45 +0200 Received: from [IPv6:2001:6f8:105b:1122:21d:e0ff:fe39:f61b] (hardanger.wlan.blackshift.org [IPv6:2001:6f8:105b:1122:21d:e0ff:fe39:f61b]) (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 4C6FE5E845; Tue, 17 Jul 2012 09:50:42 +0200 (CEST) Message-ID: <5005194A.4090900@pengutronix.de> Date: Tue, 17 Jul 2012 09:50:34 +0200 From: Marc Kleine-Budde Organization: Pengutronix e.K. User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120327 Thunderbird/11.0.1 MIME-Version: 1.0 To: davem@davemloft.net CC: Linux Netdev List , "linux-can@vger.kernel.org" , "kernel@pengutronix.de" Subject: pull request: linux-can-next 2012-07-17 X-Enigmail-Version: 1.4.1 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: X-Mailing-List: netdev@vger.kernel.org Hello David, the fifth pull request for upcoming v3.6 net-next. The first two patches (created by me) add const qualifiers to the flexcan and mpc5xxx_can driver. The next patch by Julia Lawall fixes a return value problem in the error path of the softing driver. regards, Marc --- The following changes since commit 6ba6047bf99cf4ade4f63b6b3d97cc3ad763b678: gigaset: silence GCC warning for unused 'format_ie' (2012-07-16 23:23:53 -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 da78b7998e365b3f90b2a1a55d3b6ba6cc0c5905: can: softing: softing_main: ensure a consistent return value in error case (2012-07-17 09:35:59 +0200) ---------------------------------------------------------------- Julia Lawall (1): can: softing: softing_main: ensure a consistent return value in error case Marc Kleine-Budde (2): can: flexcan: make flexcan_priv.devtype_data member point to const data can: mpc5xxx_can: make data in mpc5xxx_can_probe const drivers/net/can/flexcan.c | 4 ++-- drivers/net/can/mscan/mpc5xxx_can.c | 2 +- drivers/net/can/softing/softing_main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)