>>>>> "herbert" == Herbert Valerio Riedel <hvr@hvrlab.org> writes: Hi herbert> ...wasn't there work ongoing in 2.5's kbuild framework to make merging herbert> easier? ;) Merging without conflicts have never being a big deal, and merging with conflicts is going to be PITA always :(((( The only think that 2.5 kbuild gives you is that now it is trivial to make addons work (until now, you had to patch Makefile & Config.in, that was where almost all the problems come from). Later, Juan "that has to merge too many patchs" -- In theory, practice and theory are the same, but in practice they are different -- Larry McVoy - Linux-crypto: cryptography in and on the Linux system Archive: http://mail.nl.linux.org/linux-crypto/