[parisc-linux] Merge -rc1 -rc2 (was 2.4.19-rc1-ac6 Merge pa55: #error ...?)

joel.soete@freebel.net joel.soete@freebel.net
Wed, 17 Jul 2002 19:37:20 +0200 (CEST)


Hi,

I merge my 19-rc1 stuff with 19-rc2 and just enounter a conflict in
include/linux/personality.h:

enum{
...
+        PER_OSF4= 0x000f,

unfortunaltely the same as our:
         PER_HPUX= 0x000f,

What should I do?

Joel



-------------------------------------------------
This mail sent through Tiscali Webmail (http://webmail.tiscali.be)