Skip to contentSkip to conversation

pull-request: can-next 2012-06-04

DISCUSSION Marc Kleine-Budde 3 participants 6 messages Jun 3, 2012 – Jun 6, 2012

Subsystems (3)
lore
Share & tools
lore

Marc Kleine-Budde

author maintainer
#0 lore raw

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:
[email protected]: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(-)
Signature · 4 lines
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   |
author maintainer
#1 lore raw
Quoted 8 lines · Marc Kleine-Budde

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

Quoted 8 lines

---

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:
[email protected]: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

Signature · 4 lines
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   |
#2 lore raw

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

Quoted 25 lines · Marc Kleine-Budde
Quoted 8 lines · Marc Kleine-Budde

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

Quoted 8 lines

---

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:
[email protected]: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

maintainer
#3 lore raw

From: Oliver Hartkopp <[email protected]>
Date: Wed, 06 Jun 2012 20:02:35 +0200

Quoted 9 lines

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.

author maintainer
#4 lore raw
Quoted 7 lines · David Miller

From: Oliver Hartkopp <[email protected]>
Date: Wed, 06 Jun 2012 20:02:35 +0200

Quoted 4 lines

i think there was a confusion about

linux-can and linux-can-next

Quoted 7 lines
Quoted 5 lines

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

Signature · 4 lines
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   |
maintainer
#5 lore raw

From: Marc Kleine-Budde <[email protected]>
Date: Wed, 06 Jun 2012 23:57:10 +0200

Quoted 2 lines

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