OpenAFS Master Repository branch, openafs-stable-1_4_12_1, updated. openafs-stable-1_4_14-12-ga68bdaf

[Gerrit Code Review]

The following commit has been merged in the openafs-stable-1_4_12_1 branch:
commit a68bdaf302932d4319d774d2e1fbc83edc7c8e95
Author: Anders Kaseorg <andersk@mit.edu>
Date:   Sat Apr 30 23:35:02 2011 -0400

    Fix cherry-pick of “linux: 2.6.38: New d_op handling”
    
    Conflicts in this cherry-pick (http://gerrit.openafs.org/4041) were
    resolved incorrectly.  The correct resolution of
    """
     <<<<<<< HEAD
     ||||||| parent of 0d95e6b... linux: 2.6.38: New d_op handling
     #if defined(AFS_LINUX26_ENV)
     =======
    
     #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
         sb->s_d_op = &afs_dentry_operations;
     #endif
    
     #if defined(AFS_LINUX26_ENV)
     >>>>>>> 0d95e6b... linux: 2.6.38: New d_op handling
    """
    is
    """
    
     #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
         sb->s_d_op = &afs_dentry_operations;
     #endif
    
    """
    and not
    """
    
     #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
         sb->s_d_op = &afs_dentry_operations;
     #endif
    
     #if defined(AFS_LINUX26_ENV)
    """
    
    As usual, it’s impossible to tell the difference in the default
    conflict style, so I urge everyone reading this to run
    
    git config --global merge.conflictstyle diff3
    
    Change-Id: I09fb77b2f1d80beda7b81fa1f40f663117dae920
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    Reviewed-on: http://gerrit.openafs.org/4596
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
    Tested-by: Jeffrey Altman <jaltman@openafs.org>

 src/afs/LINUX/osi_vfsops.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

-- 
OpenAFS Master Repository