OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-856-g10da36f

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 57bc6aee44da919a080f8f6ca1e5561f24df9f92
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Thu Mar 10 10:41:57 2011 +0000

    hcrypto: don't redefine key_type
    
    Linux's keyring code uses "struct key_type", which is also used
    internally by the hcrypto code. As, on some Linux variants,
    afs/sysincludes.h ends up including the keyring definitions, we
    need to rename our internal key_type definition to something
    that doesn't clash.
    
    Change-Id: Ibfb968db0db3e80d877881fc6da4b34428ee382f
    Reviewed-on: http://gerrit.openafs.org/4192
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Tested-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/crypto/hcrypto/kernel/config.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

-- 
OpenAFS Master Repository