Patchwork pull-request: can 2012-10-10

login
register
mail settings
Submitter Marc Kleine-Budde
Date Oct. 10, 2012, 8:39 p.m.
Message ID <1349901576-30774-1-git-send-email-mkl@pengutronix.de>
Download mbox
Permalink /patch/190754/
State Accepted
Delegated to: David Miller
Headers show

Pull-request

git://gitorious.org/linux-can/linux-can.git uapi-for-3.7

Comments

Marc Kleine-Budde - Oct. 10, 2012, 8:39 p.m.
Hello David,

this pull request for net, i.e. the v3.7 release cycle, contains the patch by
David Howells to move the UAPI related headers for the CAN subsystem.

regards, Marc

--

The following changes since commit 85457685e0e314f6902caaef976b3fd8ef4f51b4:

  Merge tag 'master-2012-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2012-10-10 11:59:54 -0400)

are available in the git repository at:


  git://gitorious.org/linux-can/linux-can.git uapi-for-3.7

for you to fetch changes up to 922cd657c95fe3e4214d68a958e98288b7a55bba:

  UAPI: (Scripted) Disintegrate include/linux/can (2012-10-10 22:24:21 +0200)

----------------------------------------------------------------
David Howells (1):
      UAPI: (Scripted) Disintegrate include/linux/can

 include/linux/can/Kbuild               |    5 -----
 include/uapi/linux/can/Kbuild          |    5 +++++
 include/{ => uapi}/linux/can/bcm.h     |    0
 include/{ => uapi}/linux/can/error.h   |    0
 include/{ => uapi}/linux/can/gw.h      |    0
 include/{ => uapi}/linux/can/netlink.h |    0
 include/{ => uapi}/linux/can/raw.h     |    0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename include/{ => uapi}/linux/can/bcm.h (100%)
 rename include/{ => uapi}/linux/can/error.h (100%)
 rename include/{ => uapi}/linux/can/gw.h (100%)
 rename include/{ => uapi}/linux/can/netlink.h (100%)
 rename include/{ => uapi}/linux/can/raw.h (100%)


--
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
Marc Kleine-Budde - Oct. 10, 2012, 8:42 p.m.
On 10/10/2012 10:39 PM, Marc Kleine-Budde wrote:
> Hello David,
> 
> this pull request for net, i.e. the v3.7 release cycle, contains the patch by
> David Howells to move the UAPI related headers for the CAN subsystem.

I cherry picked David's patch, hope this is correct. Let me know, if a
merge is preferred here and I'll do so.

regards,
Marc
David Miller - Oct. 11, 2012, 2:58 a.m.
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 10 Oct 2012 22:39:35 +0200

> this pull request for net, i.e. the v3.7 release cycle, contains the patch by
> David Howells to move the UAPI related headers for the CAN subsystem.

Pulled, thanks.
--
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