* pull-request: can-next 2014-05-23
@ 2014-05-23 7:22 Marc Kleine-Budde
2014-05-23 19:44 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2014-05-23 7:22 UTC (permalink / raw)
To: netdev; +Cc: David Miller, linux-can, kernel
[-- Attachment #1: Type: text/plain, Size: 1520 bytes --]
Hello David,
this is a pull request of two patches for net-next/master. Kedareswara
rao Appana contributes support for the xilinx CAN core found on the
zynq and microblaze SOCs.
Marc
---
The following changes since commit 091b64868b43ed84334c6623ea6a08497529d4ff:
Merge branch 'mlx4-next' (2014-05-22 17:17:34 -0400)
are available in the git repository at:
git://gitorious.org/linux-can/linux-can-next.git tags/linux-can-next-for-3.16-20140523
for you to fetch changes up to 05be386b709b5feacfaa0d3582dca63e1e435b26:
can: xilinx CAN controller support (2014-05-23 08:59:21 +0200)
----------------------------------------------------------------
linux-can-next-for-3.16-20140523
----------------------------------------------------------------
Kedareswara rao Appana (2):
can: Add xilinx CAN device tree bindings documentation
can: xilinx CAN controller support
.../devicetree/bindings/net/can/xilinx_can.txt | 44 ++++++++++++++++++++++
drivers/net/can/Kconfig | 8 ++++
drivers/net/can/Makefile | 1 +
3 files changed, 53 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/can/xilinx_can.txt
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: can-next 2014-05-23
2014-05-23 7:22 pull-request: can-next 2014-05-23 Marc Kleine-Budde
@ 2014-05-23 19:44 ` David Miller
2014-05-23 20:25 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2014-05-23 19:44 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 23 May 2014 09:22:00 +0200
> this is a pull request of two patches for net-next/master. Kedareswara
> rao Appana contributes support for the xilinx CAN core found on the
> zynq and microblaze SOCs.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: can-next 2014-05-23
2014-05-23 19:44 ` David Miller
@ 2014-05-23 20:25 ` David Miller
2014-05-26 7:41 ` pull-request: can-next 2014-05-26 Marc Kleine-Budde
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2014-05-23 20:25 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: David Miller <davem@davemloft.net>
Date: Fri, 23 May 2014 15:44:33 -0400 (EDT)
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> Date: Fri, 23 May 2014 09:22:00 +0200
>
>> this is a pull request of two patches for net-next/master. Kedareswara
>> rao Appana contributes support for the xilinx CAN core found on the
>> zynq and microblaze SOCs.
>
> Pulled, thanks Marc.
Somethings not right, it looks like a forgotten git add on your side.
I'm reverting, please fix this up and resubmit.
Thanks.
make[3]: *** No rule to make target `drivers/net/can/xilinx_can.c', needed by `drivers/net/can/xilinx_can.o'. Stop.
^ permalink raw reply [flat|nested] 5+ messages in thread
* pull-request: can-next 2014-05-26
2014-05-23 20:25 ` David Miller
@ 2014-05-26 7:41 ` Marc Kleine-Budde
2014-05-30 22:50 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2014-05-26 7:41 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-can, kernel
[-- Attachment #1: Type: text/plain, Size: 2005 bytes --]
On 05/23/2014 10:25 PM, David Miller wrote:
>>> this is a pull request of two patches for net-next/master. Kedareswara
>>> rao Appana contributes support for the xilinx CAN core found on the
>>> zynq and microblaze SOCs.
> Somethings not right, it looks like a forgotten git add on your side.
Doh, yes, the file is in my tree, but not in the patch. Now the fixed
version:
This is a pull request of two patches for net-next/master. Kedareswara
rao Appana contributes support for the xilinx CAN core found on the
zynq and microblaze SoCs.
Marc
---
The following changes since commit 3bea8eddfebe1c61ea824dd2880d4368791edc1f:
Merge branch 'net-sysfs-docs' (2014-05-26 01:02:39 -0400)
are available in the git repository at:
git://gitorious.org/linux-can/linux-can-next.git tags/linux-can-next-for-3.16-20140526
for you to fetch changes up to b1201e44f50b017a4972a337058b36b40c90abca:
can: xilinx CAN controller support (2014-05-26 09:36:31 +0200)
----------------------------------------------------------------
linux-can-next-for-3.16-20140526
----------------------------------------------------------------
Kedareswara rao Appana (2):
can: Add xilinx CAN device tree bindings documentation
can: xilinx CAN controller support
.../devicetree/bindings/net/can/xilinx_can.txt | 44 +
drivers/net/can/Kconfig | 8 +
drivers/net/can/Makefile | 1 +
drivers/net/can/xilinx_can.c | 1208 ++++++++++++++++++++
4 files changed, 1261 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/can/xilinx_can.txt
create mode 100644 drivers/net/can/xilinx_can.c
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: can-next 2014-05-26
2014-05-26 7:41 ` pull-request: can-next 2014-05-26 Marc Kleine-Budde
@ 2014-05-30 22:50 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2014-05-30 22:50 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 26 May 2014 09:41:59 +0200
> On 05/23/2014 10:25 PM, David Miller wrote:
>>>> this is a pull request of two patches for net-next/master. Kedareswara
>>>> rao Appana contributes support for the xilinx CAN core found on the
>>>> zynq and microblaze SOCs.
>
>> Somethings not right, it looks like a forgotten git add on your side.
>
> Doh, yes, the file is in my tree, but not in the patch. Now the fixed
> version:
>
> This is a pull request of two patches for net-next/master. Kedareswara
> rao Appana contributes support for the xilinx CAN core found on the
> zynq and microblaze SoCs.
That looks better, pulled, thanks Marc.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-30 22:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-23 7:22 pull-request: can-next 2014-05-23 Marc Kleine-Budde
2014-05-23 19:44 ` David Miller
2014-05-23 20:25 ` David Miller
2014-05-26 7:41 ` pull-request: can-next 2014-05-26 Marc Kleine-Budde
2014-05-30 22:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).