* pull-request: can-next 2012-06-04
@ 2012-06-03 22:52 Marc Kleine-Budde
2012-06-04 15:52 ` Marc Kleine-Budde
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2012-06-03 22:52 UTC (permalink / raw)
To: davem; +Cc: Linux Netdev List, linux-can
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
Hello David,
here are the first patches for net-next, they add power management
support for the flexcan driver and clarify the documentation with
respect to error messages.
regards, Marc
---
The following changes since commit 31a67102f4762df5544bc2dfb34a931233d2a5b2:
Fix blocking allocations called very early during bootup (2012-05-21 12:52:42 -0700)
are available in the git repository at:
git@gitorious.org:linux-can/linux-can-next.git master
Eric Bénard (1):
can: flexcan: add PM support
Oliver Hartkopp (1):
can: update documentation wording error frames -> error messages
Documentation/networking/can.txt | 32 ++++++++++++++++----------------
drivers/net/can/flexcan.c | 38 ++++++++++++++++++++++++++++++++++++++
include/linux/can.h | 8 ++++----
include/linux/can/error.h | 4 ++--
net/can/af_can.c | 10 +++++-----
5 files changed, 65 insertions(+), 27 deletions(-)
--
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: 262 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2012-06-04
2012-06-03 22:52 pull-request: can-next 2012-06-04 Marc Kleine-Budde
@ 2012-06-04 15:52 ` Marc Kleine-Budde
2012-06-06 18:02 ` Oliver Hartkopp
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2012-06-04 15:52 UTC (permalink / raw)
To: davem; +Cc: Linux Netdev List, linux-can
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
On 06/04/2012 12:52 AM, Marc Kleine-Budde wrote:
> Hello David,
>
> here are the first patches for net-next, they add power management
> support for the flexcan driver and clarify the documentation with
> respect to error messages.
>
> regards, Marc
>
> ---
>
> The following changes since commit 31a67102f4762df5544bc2dfb34a931233d2a5b2:
>
> Fix blocking allocations called very early during bootup (2012-05-21 12:52:42 -0700)
>
> are available in the git repository at:
> git@gitorious.org:linux-can/linux-can-next.git master
That should be:
git://gitorious.org/linux-can/linux-can-next.git master
Sorry for the noise,
Marc
--
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: 262 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2012-06-04
2012-06-04 15:52 ` Marc Kleine-Budde
@ 2012-06-06 18:02 ` Oliver Hartkopp
2012-06-06 18:15 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Oliver Hartkopp @ 2012-06-06 18:02 UTC (permalink / raw)
To: davem; +Cc: Marc Kleine-Budde, Linux Netdev List, linux-can
Hello Dave,
i think there was a confusion about
linux-can and linux-can-next
pull requests that overlapped in the mail traffic that day.
The pull request of linux-can-next is still pending.
git://gitorious.org/linux-can/linux-can-next.git master
Regards,
Oliver
On 04.06.2012 17:52, Marc Kleine-Budde wrote:
> On 06/04/2012 12:52 AM, Marc Kleine-Budde wrote:
>> Hello David,
>>
>> here are the first patches for net-next, they add power management
>> support for the flexcan driver and clarify the documentation with
>> respect to error messages.
>>
>> regards, Marc
>>
>> ---
>>
>> The following changes since commit 31a67102f4762df5544bc2dfb34a931233d2a5b2:
>>
>> Fix blocking allocations called very early during bootup (2012-05-21 12:52:42 -0700)
>>
>> are available in the git repository at:
>> git@gitorious.org:linux-can/linux-can-next.git master
>
> That should be:
>
> git://gitorious.org/linux-can/linux-can-next.git master
>
> Sorry for the noise,
> Marc
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2012-06-04
2012-06-06 18:02 ` Oliver Hartkopp
@ 2012-06-06 18:15 ` David Miller
2012-06-06 21:57 ` Marc Kleine-Budde
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2012-06-06 18:15 UTC (permalink / raw)
To: socketcan; +Cc: mkl, netdev, linux-can
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Wed, 06 Jun 2012 20:02:35 +0200
> i think there was a confusion about
>
> linux-can and linux-can-next
>
> pull requests that overlapped in the mail traffic that day.
>
> The pull request of linux-can-next is still pending.
>
> git://gitorious.org/linux-can/linux-can-next.git master
Strange, I thought I had pulled it, I've done so now, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2012-06-04
2012-06-06 18:15 ` David Miller
@ 2012-06-06 21:57 ` Marc Kleine-Budde
2012-06-06 22:42 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2012-06-06 21:57 UTC (permalink / raw)
To: David Miller; +Cc: socketcan, netdev, linux-can
[-- Attachment #1: Type: text/plain, Size: 867 bytes --]
On 06/06/2012 08:15 PM, David Miller wrote:
> From: Oliver Hartkopp <socketcan@hartkopp.net>
> Date: Wed, 06 Jun 2012 20:02:35 +0200
>
>> i think there was a confusion about
>>
>> linux-can and linux-can-next
>>
>> pull requests that overlapped in the mail traffic that day.
>>
>> The pull request of linux-can-next is still pending.
>>
>> git://gitorious.org/linux-can/linux-can-next.git master
>
> Strange, I thought I had pulled it, I've done so now, thanks.
Thanks.
I've some patches for net-next which depend on net. When do you merge
net to net-next?
Marc
--
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: 262 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2012-06-04
2012-06-06 21:57 ` Marc Kleine-Budde
@ 2012-06-06 22:42 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2012-06-06 22:42 UTC (permalink / raw)
To: mkl; +Cc: socketcan, netdev, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 06 Jun 2012 23:57:10 +0200
> I've some patches for net-next which depend on net. When do you merge
> net to net-next?
Periodically, and when specific needs arise such as your's.
I've just merged net into net-next
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-06 22:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-03 22:52 pull-request: can-next 2012-06-04 Marc Kleine-Budde
2012-06-04 15:52 ` Marc Kleine-Budde
2012-06-06 18:02 ` Oliver Hartkopp
2012-06-06 18:15 ` David Miller
2012-06-06 21:57 ` Marc Kleine-Budde
2012-06-06 22:42 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.