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

[Alan Cox]

On Wed, 2002-07-17 at 18:37, joel.soete@freebel.net wrote:
> 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?

I've asked Marcelo to use 0x0010 for OSF4 (its just added and not an
established constant)