From: Marc Kleine-Budde <mkl@pengutronix.de>
To: David Howells <dhowells@redhat.com>
Cc: socketcan@hartkopp.net, linux-can@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] Disintegrate UAPI for can
Date: Wed, 10 Oct 2012 19:40:04 +0200 [thread overview]
Message-ID: <5075B2F4.60708@pengutronix.de> (raw)
In-Reply-To: <30687.1349789402@warthog.procyon.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1348 bytes --]
On 10/09/2012 03:30 PM, David Howells wrote:
> Can you merge the following branch into the can tree please.
>
> This is to complete part of the Userspace API (UAPI) disintegration for which
> the preparatory patches were pulled recently. After these patches, userspace
> headers will be segregated into:
>
> include/uapi/linux/.../foo.h
>
> for the userspace interface stuff, and:
>
> include/linux/.../foo.h
>
> for the strictly kernel internal stuff.
Nice work David. The upstream for can-next is David Miller's net-next
tree. He doesn't like if I pull unrelated stuff into my tree, so I'm
going to cherry pick your patch. This is not yet possible, as net-next
doesn't include the latest patches from the 3.7 merge window, so that
compilation breaks. After the merge window closes David Miller merges
back the latest changes to net-next. I'll postpone your patch until
then, this means the code will go into v3.8. I'm not familiar with the
UAPI conversion, should your patch go via linux-can and David's net into
v3.7?
regards, 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: 259 bytes --]
next prev parent reply other threads:[~2012-10-10 17:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 13:30 [GIT PULL] Disintegrate UAPI for can David Howells
2012-10-09 17:55 ` Oliver Hartkopp
2012-10-10 5:58 ` Marc Kleine-Budde
2012-10-10 17:40 ` Marc Kleine-Budde [this message]
2012-10-10 18:00 ` David Howells
2012-10-10 19:55 ` Marc Kleine-Budde
2012-10-10 20:08 ` David Miller
2012-10-10 20:23 ` Marc Kleine-Budde
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=5075B2F4.60708@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=dhowells@redhat.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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.