Re: [PATCH can-utils 1/3] Update license information for some header files

[Oliver Hartkopp <socketcan@hartkopp.net>]

On 12.01.2014 00:10, Uwe Kleine-König wrote:
> This corresponds to Linux commits
>   2485602f1af2 (can: add explicit copyrights to can headers)
>   1c2da13c21a1 (can: add explicit copyrights to can's netlink header)
> ---
> Hello,
> 
> I would have expected to just need to do something like:
> 
> cd $path_to_canutils
> rm -r include/socketcan/can
> cd $path_to_linux
> git archive --format=tar --prefix=socketcan/can/ v3.13-rc7:include/uapi/linux/can | tar xC $path_to_canutils/include
> git cat-file blob v3.13-rc7:include/uapi/linux/can.h > $path_to_canutils/include/socketcan/can.h
> 
> to sync the header files. I didn't test but some changes introduced by
> the above sequence seem to be uncompilable so I choosed to only
> cherry-pick the two Linux commits. IMHO this is a bug (in Linux or
> can-utils or maybe both).
> 
> Best regards
> Uwe
> 
>  include/socketcan/can/bcm.h     | 32 ++++++++++++++++++++++++++++++++
>  include/socketcan/can/error.h   | 32 ++++++++++++++++++++++++++++++++
>  include/socketcan/can/gw.h      | 32 ++++++++++++++++++++++++++++++++
>  include/socketcan/can/netlink.h |  8 ++++++++
>  include/socketcan/can/raw.h     | 32 ++++++++++++++++++++++++++++++++
>  5 files changed, 136 insertions(+)

Hello Uwe,

thanks for the effort.

Btw.

- include/socketcan/can.h
- include/socketcan/can/isotp.h

are both missing in this process.

Unfortunately we missed linux/include/uapi/linux/can.h in commit 2485602f1af2
(can: add explicit copyrights to can headers).

Would you like to pick this update of your original commit too?

Best regards,
Oliver