Re: [PATCH v5 5/5] include: Move includes copied from the Linux kernel into include/linux

[Oliver Hartkopp <socketcan@hartkopp.net>]

On 17.01.2014 21:36, Uwe Kleine-König wrote:

>>
>> https://gitorious.org/linux-can/can-modules
> Is it a possibility to merge can-modules and can-utils?

NO!

> Then there would
> only a single instance of isotp.h be needed. 

NO!

> IIUC the source of isotp.h
> is in can-modules. If so, adding a license to it should be done in
> can-modules, too.

Uwe,

please take a look at the history of the things you are trying to re-organize
all the time.

If you look at the original BerliOS SVN

	http://developer.berlios.de/svn/?group_id=6475

you'll see that it was exactly like this.

There were utils, test applications and the kernel stuff in one single SVN
referring one single include directory which was located in

	trunk/kernel/2.6/include/socketcan

to not interfere with existing or different kernel includes.

This worked pretty fine that time as it also was intended to be able to
backport updated CAN stuff into older kernels like 2.6.18.

Therefore several scripts (see trunk/mkpatch) had been used to create patches
that remove the existing stuff in linux/net/can and update the entire CAN
subsystem with a newer version with bugfixes and feature enhancements.

Doing this we were able to include e.g. the can-gw or the developed isotp into
an older OSELAS BSP with 2.6.28.10 kernel.

But that's history.

With the move to gitorious the SVN trunk was splitted into several independent
git repos that were just in sub-directories before:

- can-utils
- can-tests
- can-misc
- can-modules
- can-modules-24

To have these separate git repos the includes became part of every single repo
- which is not very optimal ...

Btw. the iproute2 package has a similar requirements to contain updated kernel
includes.

So today (6 years after PF_CAN mainline) the stuff in can-modules(-24) is not
really maintained anymore as supporting 2.4.x and 2.6.2x kernels is not that
relevant now. The only stuff that needs to be brought to mainline isotp.c .

So I would just let the hands off can-modules(-24) as the new development is
done in recent git repos like https://gitorious.org/linux-can/linux-can-next.

The isotp socket API has been established for a while now and is used by
several peoples. As I do not expect any changes to isotp.h it's ok to host it
together(!) with the other kernel includes we've been discussion before.

As we only talk about userspace applications now the way using
include/socketcan which was needed for the stuff in trunk/kernel/2.6/net/can
became obviously obsolete in can-utils and can-tests.

The stuff in can-utils and can-tests are widely used and therefore I
appreciate your work to clean up the includes and update the license
information there. But you can omit any further activities in can-modules.

Regards,
Oliver

ps. @Marc: Your patch "[PATCH v6 5/5] include: Move includes from
include/socketcan to include/linux" moves the *current* files. There are still
no updates in the license information in can.h, can/raw.h, ... Tnx