xen pv_ops git merge conflicts unresolved?

["Marc - A. Dahlhaus [ Administration | Westermann GmbH ]" <mad@wol.de>]

Hello Jeremy,


it looks like there were some merge conflicts yesterday on the following
commits/files and they didn't got resolved properly...

commit 5b82413a71a831afe91f3b3b7242deea06d65a8c

Conflicts:
arch/x86/kernel/ioport.c
arch/x86/kernel/process_64.c
arch/x86/mm/pgtable.c
arch/x86/xen/Kconfig


commit c98c8642f3d2df5567404f348c4d370c8ccc0846

Conflicts:
arch/x86/kernel/process_32.c


A build fails now with:

  CC      arch/x86/kernel/process_32.o
arch/x86/kernel/process_32.c:461:3: warning: "/*" within comment
arch/x86/kernel/process_32.c:462: error: expected ')' before '(' token
arch/x86/kernel/process_32.c:463: error: expected identifier or '('
before '}' token
arch/x86/kernel/process_32.c:464: warning: data definition has no type
or storage class
arch/x86/kernel/process_32.c:464: warning: type defaults to 'int' in
declaration of 'putname'
arch/x86/kernel/process_32.c:464: warning: parameter names (without
types) in function declaration
arch/x86/kernel/process_32.c:464: error: conflicting types for 'putname'
include/linux/fs.h:1734: error: previous declaration of 'putname' was
here
arch/x86/kernel/process_32.c:465: error: expected '=', ',', ';', 'asm'
or '__attribute__' before ':' token
arch/x86/kernel/process_32.c:467: error: expected identifier or '('
before '}' token
make[1]: *** [arch/x86/kernel/process_32.o] Error 1
make: *** [arch/x86/kernel] Error 2


Marc