OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_22_2-35-g6c638e3

[Gerrit Code Review]

The following commit has been merged in the openafs-stable-1_6_x branch:
commit 6c638e37d3847ee266b07382b80b11ee6da1eefe
Author: Stephan Wiesand <stephan.wiesand@desy.de>
Date:   Wed Apr 4 17:09:39 2018 +0200

    FBSD: param.h consistency
    
    Commit 88dc4d93f5ef080da8f56fac453f095e6c79d4a0 ("Add param.h
    files for recent FreeBSD") introduced an inconsistency between
    the i386 and amd64 param.h files for 11.1 and 12.0 regarding
    the *_FBSD101_ENV #defines.
    
    Citing Benjamin Kaduk: "Traditionally we have the param.h for
    a FreeBSD N.0 release include the (N-1).Y values that existed
    at the time of the N.0 release, and freeze that set of (N-1).Y
    values for the lifetime of FreeBSD N.x, if that makes sense."
    
    Given that FreeBSD 11.0 was released shortly after 10.3, and
    12.0 is not yet released, consistently #define
    *_FBSD10{1..3}_ENV for 11.1 and *_FBSD10{1..4}_ENV for 12.0
    
    Reviewed-on: https://gerrit.openafs.org/12990
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
    (cherry picked from commit 154512831966d12c1e32e6271d4ab1440a25b96e)
    
    Reviewed-on: https://gerrit.openafs.org/12997
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
    (cherry picked from commit b30f21b8ec494d921c6ac513bf1022d5937ba220)
    
    Change-Id: Ic887d86e23567af04b6ee50d460ff1db8a263414
    Reviewed-on: https://gerrit.openafs.org/13024
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
    Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

 src/config/param.amd64_fbsd_111.h |    9 +++++++++
 src/config/param.amd64_fbsd_120.h |   12 ++++++++++++
 src/config/param.i386_fbsd_111.h  |    6 ++++++
 src/config/param.i386_fbsd_120.h  |    9 +++++++++
 4 files changed, 36 insertions(+), 0 deletions(-)

-- 
OpenAFS Master Repository