All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Oliver Hartkopp <socketcan@hartkopp.net>,
	"linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Cc: Stephane Grosjean <s.grosjean@peak-system.com>
Subject: Re: [PATCH can-next] Add CAN FD driver infrastructure
Date: Wed, 12 Feb 2014 12:15:09 +0100	[thread overview]
Message-ID: <52FB57BD.90704@pengutronix.de> (raw)
In-Reply-To: <52F3DC33.6080402@hartkopp.net>

[-- Attachment #1: Type: text/plain, Size: 896 bytes --]

On 02/06/2014 08:02 PM, Oliver Hartkopp wrote:
> My patch is currently based on Davems net-tree, as this patch
> 
> http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=0ae89beb283a0db5980d1d4781c7d7be2f2810d6
> 
> is currently not in mainline nor in net-next nor in linux-can-next.
> 
> As the above patch clashes with the changes I did, I'll wait for Daves
> net-next tree to be opened for development again before sending the patch set.

net-next is open and I've send a pull request to merge can-next/testing
branch. Do you have a series with split patches I can have a look at?

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: 242 bytes --]

  parent reply	other threads:[~2014-02-12 11:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-05 19:32 [PATCH can-next] Add CAN FD driver infrastructure Oliver Hartkopp
2014-02-06 11:41 ` Marc Kleine-Budde
2014-02-06 19:02   ` Oliver Hartkopp
2014-02-06 20:39     ` Marc Kleine-Budde
2014-02-12 11:15     ` Marc Kleine-Budde [this message]
2014-02-12 19:33       ` Oliver Hartkopp
2014-02-13 11:55         ` Marc Kleine-Budde
2014-02-14 20:58           ` Oliver Hartkopp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52FB57BD.90704@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=linux-can@vger.kernel.org \
    --cc=s.grosjean@peak-system.com \
    --cc=socketcan@hartkopp.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.