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.
---
The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-can-20121009
for you to fetch changes up to c523b9b41d6bfdd035b5c25063ad13967f3306cd:
UAPI: (Scripted) Disintegrate include/linux/can (2012-10-09 09:48:41 +0100)
----------------------------------------------------------------
UAPI Disintegration 2012-10-09
----------------------------------------------------------------
David Howells (1):
UAPI: (Scripted) Disintegrate include/linux/can
include/linux/can/Kbuild | 5 -----
include/uapi/linux/can/Kbuild | 5 +++++
include/{ => uapi}/linux/can/bcm.h | 0
include/{ => uapi}/linux/can/error.h | 0
include/{ => uapi}/linux/can/gw.h | 0
include/{ => uapi}/linux/can/netlink.h | 0
include/{ => uapi}/linux/can/raw.h | 0
7 files changed, 5 insertions(+), 5 deletions(-)
rename include/{ => uapi}/linux/can/bcm.h (100%)
rename include/{ => uapi}/linux/can/error.h (100%)
rename include/{ => uapi}/linux/can/gw.h (100%)
rename include/{ => uapi}/linux/can/netlink.h (100%)
rename include/{ => uapi}/linux/can/raw.h (100%)
.
Hello Marc,
can you please pull these changes, so that they can go via the CAN tree to Dave?
Thanks,
Oliver
On 09.10.2012 15:30, 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.
>
> ---
> The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
>
> Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900)
>
> are available in the git repository at:
>
>
> git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-can-20121009
>
> for you to fetch changes up to c523b9b41d6bfdd035b5c25063ad13967f3306cd:
>
> UAPI: (Scripted) Disintegrate include/linux/can (2012-10-09 09:48:41 +0100)
>
> ----------------------------------------------------------------
> UAPI Disintegration 2012-10-09
>
> ----------------------------------------------------------------
> David Howells (1):
> UAPI: (Scripted) Disintegrate include/linux/can
>
> include/linux/can/Kbuild | 5 -----
> include/uapi/linux/can/Kbuild | 5 +++++
> include/{ => uapi}/linux/can/bcm.h | 0
> include/{ => uapi}/linux/can/error.h | 0
> include/{ => uapi}/linux/can/gw.h | 0
> include/{ => uapi}/linux/can/netlink.h | 0
> include/{ => uapi}/linux/can/raw.h | 0
> 7 files changed, 5 insertions(+), 5 deletions(-)
> rename include/{ => uapi}/linux/can/bcm.h (100%)
> rename include/{ => uapi}/linux/can/error.h (100%)
> rename include/{ => uapi}/linux/can/gw.h (100%)
> rename include/{ => uapi}/linux/can/netlink.h (100%)
> rename include/{ => uapi}/linux/can/raw.h (100%)
> .
> --
> To unsubscribe from this list: send the line "unsubscribe linux-can" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/09/2012 07:55 PM, Oliver Hartkopp wrote:
> Hello Marc,
>
> can you please pull these changes, so that they can go via the CAN tree to Dave?
Sure, will do, when I have a proper internet connection again. This will
be this evening. :)
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 |
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 |
Marc Kleine-Budde <[email protected]> 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
On 10/10/2012 08:00 PM, David Howells wrote:
> Marc Kleine-Budde <[email protected]> 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.
I don't mind, as long as it compiles (using you tag), and it does, the
patch doesn't break anything. From the linux-can and David Miller's net
point of view, v3.7 is closed for new features just bug fixes are
allowed. But I'm open to make an exception, if UAPI hits mainline in
v3.7 on most subsystems. Hopefully David sees it the same way.
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 |
From: Marc Kleine-Budde <[email protected]>
Date: Wed, 10 Oct 2012 21:55:27 +0200
> On 10/10/2012 08:00 PM, David Howells wrote:
>> Marc Kleine-Budde <[email protected]> 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.
>
> I don't mind, as long as it compiles (using you tag), and it does, the
> patch doesn't break anything. From the linux-can and David Miller's net
> point of view, v3.7 is closed for new features just bug fixes are
> allowed. But I'm open to make an exception, if UAPI hits mainline in
> v3.7 on most subsystems. Hopefully David sees it the same way.
We're putting the UAPI stuff in now, don't delay this please.
On 10/10/2012 10:08 PM, David Miller wrote:
> From: Marc Kleine-Budde <[email protected]>
> Date: Wed, 10 Oct 2012 21:55:27 +0200
>
>> On 10/10/2012 08:00 PM, David Howells wrote:
>>> Marc Kleine-Budde <[email protected]> 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.
>>
>> I don't mind, as long as it compiles (using you tag), and it does, the
>> patch doesn't break anything. From the linux-can and David Miller's net
>> point of view, v3.7 is closed for new features just bug fixes are
>> allowed. But I'm open to make an exception, if UAPI hits mainline in
>> v3.7 on most subsystems. Hopefully David sees it the same way.
>
> We're putting the UAPI stuff in now, don't delay this please.
That's a clear statement :)
Thanks David,
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 |