From: David Howells <dhowells@redhat.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: dhowells@redhat.com, socketcan@hartkopp.net,
linux-can@vger.kernel.org, linux-kernel@vger.kernel.org,
davem@davemloft.net
Subject: Re: [GIT PULL] Disintegrate UAPI for can
Date: Wed, 10 Oct 2012 19:00:24 +0100 [thread overview]
Message-ID: <27643.1349892024@warthog.procyon.org.uk> (raw)
In-Reply-To: <5075B2F4.60708@pengutronix.de>
Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> 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?
It's okay for the patch to go into 3.8 if that is easier for you. As it's
scripted, I can regenerate your branch after -rc1 if that helps too.
David
next prev parent reply other threads:[~2012-10-10 18:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 13:30 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
2012-10-10 18:00 ` David Howells [this message]
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=27643.1349892024@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome