Merge master into experimental

Pick up the FORCE_SOURCE_DATE change and changelog entry, but ignore
the new patch there, which is already included in 1.8.0pre2.

Change-Id: Idbe6b09e863456c186de93edfa89eb9bbd5d14e0

diff --cc debian/changelog
index d14fe82b4e7f6b3151f855639e8f7fe2cee91ad4,d1f29c0478b59941170e8ae6f5a2b767da43f843..3589acb293d6b135719580fb6a5d69cae6f6dbe9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,80 -1,13 +1,90 @@@
 +openafs (1.8.0~pre2-1) UNRELEASED; urgency=low
 +
 +  * Add versioned build-depends for renamed symbols in heimdal-multidev.
 +    (Closes: #848664)
 +  * New upstream prerelease:
 +    - Desupport 32-bit s390/s390x
 +    - Adopt jenkins hash for endianness independence
 +    - With afsd -debug, print syscalls on separate lines
 +    - Restore debug symbols for the kernel module
 +    - Support Linux up to 4.13
 +    - Provide vldb cache timeout option for clients
 +    - Eliminate potential 100ms delay after rx receive window changes
 +    - Modify volume update date after salvager makes changes
 +    - Restore client behavior of trying all servers instead of looping on an
 +      unresponsive preferred server
 +    - Improve ubik safety for relabels and writes shortly after an election
 +    - Preserve volume stats during reclone and restore operations
 +
 + -- Benjamin Kaduk <kaduk@mit.edu>  Wed, 30 Aug 2017 19:45:54 -0500
 +
 +openafs (1.8.0~pre1-5) experimental; urgency=medium
 +
 +  * debian/patches/opr-Make-opr_jhash_opaque-endian-independent.patch,
 +    debian/patches/opr-Make-opr_jhash_opaque-consistent-with-opr_jhash.patch,
 +    debian/patches/opr-Make-opr_uuid_hash-endian-independent.patch: Fix
 +    test failures on big-endian architectures.
 +
 + -- Anders Kaseorg <andersk@mit.edu>  Wed, 21 Dec 2016 20:01:40 -0500
 +
 +openafs (1.8.0~pre1-4) experimental; urgency=medium
 +
 +  * debian/patches/0006-softsig-helper-fix-signame-loop.patch
 +    Fix test failures on 32-bit architectures.
 +  * debian/patches/0007-Run-jhash-t-verbosely.patch
 +    Provide more output from failing tests.
 +
 + -- Benjamin Kaduk <kaduk@mit.edu>  Fri, 16 Dec 2016 00:26:39 -0500
 +
 +openafs (1.8.0~pre1-3) experimental; urgency=medium
 +
 +  * Replace hard-coded x86_64-linux-gnu with DEB_HOST_MULTIARCH.
 +  * Use dh_auto_configure.
 +
 + -- Anders Kaseorg <andersk@mit.edu>  Thu, 15 Dec 2016 01:27:21 -0500
 +
 +openafs (1.8.0~pre1-2) experimental; urgency=medium
 +
 +  * Move libtool, heimdal-multidev from Build-Depends-Indep to
 +    Build-Depends.
 +  * debian/patches/tests-opr-softsig-t-Avoid-hanging-due-to-intermediat.patch,
 +    debian/patches/opr-ExitHandler-re-raise-the-signal-instead-of-exiti.patch
 +    Fix test failures.
 +
 + -- Anders Kaseorg <andersk@mit.edu>  Wed, 14 Dec 2016 18:40:15 -0500
 +
 +openafs (1.8.0~pre1-1) experimental; urgency=low
 +
 +  * New upstream major release:
 +    - Servers no longer use rxkad.keytab for long-term keys, which are
 +      now stored in KeyFileExt.  Administrators must use akeyconvert
 +      or similar tooling to populate the KeyFileExt.  In most cases,
 +      `akeyconvert` with no arguments will suffice.
 +    - kaserver, klog.afs, pam-openafs-kaserver, and other kauth-related
 +      tools are removed.
 +    - Server log handling has changed.  Logs are not truncated at
 +      startup by default, and are re-opened on SIGUSR1, to be compatible
 +      with external log rotation tools.
 +    - Client time management support (afsd -settime and afsd -nosettime)
 +      has been removed.
 +    - Linux versions prior to 2.6 are no longer supported by the client.
 +    - Most binaries now use pthreads instead of LWP green threads.
 +    - The fileserver ihandle fsync thread is removed.
 +    - Many other generic improvements throughout the tree; consult the
 +      upstream changelog for details.
 +
 + -- Benjamin Kaduk <kaduk@mit.edu>  Tue, 13 Dec 2016 01:49:46 -0500
 +
+ openafs (1.6.21-3) unstable; urgency=medium
+ 
+   * Build documentation with FORCE_SOURCE_DATE=1, without which pdfTeX
+     refuses to behave fully reproducibly.
+   * debian/patches:
+     - Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch: Fix
+     build failure on s390x with Linux kernel 4.12.  (LP: #1711835)
+ 
+  -- Anders Kaseorg <andersk@mit.edu>  Wed, 30 Aug 2017 23:42:03 -0400
+ 
  openafs (1.6.21-2) unstable; urgency=medium
  
    * debian/patches:

diff --cc debian/rules
Simple merge