OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-854-g037acc5

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 037acc5ac01884a8ad7439f228284e07d1972d63
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Thu Mar 10 09:43:35 2011 +0000

    Revert "hcrypto: avoid key_type redefinition"
    
    This reverts commit 81487fcf3ae93d2efea6f0935a0493680b5d3d11.
    
    This change didn't receive sufficient review before it was pushed.
    It breaks builds on IRIX, and produces kernel modules that don't
    load on a number of other Linux-based systems.
    
    A correct fix for the underlying problem (that both Linux and
    hcrypto want to use the "struct key_type" identifier) will follow
    this patch.
    
    Change-Id: Ib215f9d8adde75180a86f985052c77600a294895
    Reviewed-on: http://gerrit.openafs.org/4191
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
    Tested-by: Jeffrey Altman <jaltman@openafs.org>

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

-- 
OpenAFS Master Repository