diff -Nru llvm-toolchain-3.8-3.8.1~+rc1/debian/changelog llvm-toolchain-3.8-3.8.1~+rc1/debian/changelog
--- llvm-toolchain-3.8-3.8.1~+rc1/debian/changelog	2016-06-08 11:19:02.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1~+rc1/debian/changelog	2016-06-18 12:55:27.000000000 +0200
@@ -1,3 +1,16 @@
+llvm-toolchain-3.8 (1:3.8.1~+rc1-1~exp1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian (LP: #1593952); remaining changes:
+    - Disable lldb on s390x.
+    - Remove the build tree before calling dh_strip; at least the amd64 buildd
+      runs out of diskspace at this step.
+    - rules: Allow LLVM tests to fail on i386, we know dropping AVX512 breaks
+      them.
+    - drop-avx512-from-skylake.diff: Don't enable AVX512 on Skylake, as it's
+      a server cpu feature and breaks llvmpipe on workstations.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 18 Jun 2016 12:54:33 +0200
+
 llvm-toolchain-3.8 (1:3.8.1~+rc1-1~exp1) experimental; urgency=medium
 
   * New RC release
@@ -32,6 +45,29 @@
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 26 May 2016 17:30:00 +0200
 
+llvm-toolchain-3.8 (1:3.8-2ubuntu3) xenial; urgency=medium
+
+  * rules: Allow LLVM tests to fail on i386, we know dropping AVX512 breaks
+    them.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 21 Apr 2016 08:16:04 +0300
+
+llvm-toolchain-3.8 (1:3.8-2ubuntu2) xenial; urgency=medium
+
+  * drop-avx512-from-skylake.diff: Don't enable AVX512 on Skylake, as it's
+    a server cpu feature and breaks llvmpipe on workstations. (LP: #1564156)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 20 Apr 2016 13:12:25 +0300
+
+llvm-toolchain-3.8 (1:3.8-2ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Disable lldb on s390x.
+    - Remove the build tree before calling dh_strip; at least the amd64 buildd
+      runs out of diskspace at this step.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 08 Mar 2016 12:30:58 +0100
+
 llvm-toolchain-3.8 (1:3.8-2) unstable; urgency=medium
 
   * Team upload.
@@ -67,6 +103,23 @@
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 25 Feb 2016 14:26:14 +0100
 
+llvm-toolchain-3.8 (1:3.8~+rc2-1~exp1ubuntu2) xenial; urgency=medium
+
+  * clang-tidy-3.8: Remove Breaks/Replaces on clang-modernize-3.8.
+  * libllvm3.8: Add Breaks/Replaces on libllvm3.8v4 (anticipated package
+    name for backports to trusty).
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Feb 2016 12:36:43 +0100
+
+llvm-toolchain-3.8 (1:3.8~+rc2-1~exp1ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Disable lldb on s390x.
+    - Remove the build tree before calling dh_strip; at least the amd64 buildd
+      runs out of diskspace at this step.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 09 Feb 2016 14:44:36 +0100
+
 llvm-toolchain-3.8 (1:3.8~+rc2-1~exp1) experimental; urgency=medium
 
   * New snapshot release
@@ -75,6 +128,14 @@
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 03 Feb 2016 08:59:32 +0100
 
+llvm-toolchain-3.8 (1:3.8~+rc1-1~exp1ubuntu3) xenial; urgency=medium
+
+  * Disable lldb on s390x.
+  * Remove the build tree before calling dh_strip; at least the amd64 buildd
+    runs out of diskspace at this step.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 03 Feb 2016 14:32:41 +0100
+
 llvm-toolchain-3.8 (1:3.8~+rc1-1~exp1) experimental; urgency=medium
 
   * New snapshot release
diff -Nru llvm-toolchain-3.8-3.8.1~+rc1/debian/control llvm-toolchain-3.8-3.8.1~+rc1/debian/control
--- llvm-toolchain-3.8-3.8.1~+rc1/debian/control	2016-06-08 11:18:06.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1~+rc1/debian/control	2016-06-18 12:50:57.000000000 +0200
@@ -196,6 +196,8 @@
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Breaks: libllvm3.8v4
+Replaces: libllvm3.8v4
 Multi-Arch: same
 Description: Modular compiler and toolchain technologies, runtime library
  LLVM is a collection of libraries and tools that make it easy to build
diff -Nru llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/drop-avx512-from-skylake.diff llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/drop-avx512-from-skylake.diff
--- llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/drop-avx512-from-skylake.diff	1970-01-01 01:00:00.000000000 +0100
+++ llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/drop-avx512-from-skylake.diff	2016-06-18 12:50:57.000000000 +0200
@@ -0,0 +1,16 @@
+--- a/lib/Target/X86/X86.td
++++ b/lib/Target/X86/X86.td
+@@ -487,13 +487,7 @@ def : KnightsLandingProc<"knl">;
+ // FIXME: define SKX model
+ class SkylakeProc<string Name> : ProcessorModel<Name, HaswellModel, [
+   FeatureMMX,
+-  FeatureAVX512,
+   FeatureFXSR,
+-  FeatureCDI,
+-  FeatureDQI,
+-  FeatureBWI,
+-  FeatureVLX,
+-  FeaturePKU,
+   FeatureCMPXCHG16B,
+   FeatureSlowBTMem,
+   FeaturePOPCNT,
diff -Nru llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/series llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/series
--- llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/series	2016-06-08 10:20:44.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1~+rc1/debian/patches/series	2016-06-18 12:51:32.000000000 +0200
@@ -40,3 +40,4 @@
 llvm25468-lldb-swig-format-security.diff
 llvm26003-sanitizer-check-env.diff
 scan-view-fix-path.diff
+drop-avx512-from-skylake.diff
diff -Nru llvm-toolchain-3.8-3.8.1~+rc1/debian/rules llvm-toolchain-3.8-3.8.1~+rc1/debian/rules
--- llvm-toolchain-3.8-3.8.1~+rc1/debian/rules	2016-06-08 11:17:31.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1~+rc1/debian/rules	2016-06-18 12:50:57.000000000 +0200
@@ -440,6 +440,8 @@
 
 
 override_dh_strip:
+	: # running out of diskspace on the buildds
+	find $(TARGET_BUILD) -name '*.o' -o -name '*.a' | xargs -r rm -f
 	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg
 	dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg
 	dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=liblldb-$(LLVM_VERSION)-dbg
@@ -465,7 +467,7 @@
 
 ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 # List of the archs we know we have 100 % tests working
-ARCH_LLVM_TEST_OK := i386
+ARCH_LLVM_TEST_OK :=
 
 override_dh_auto_test: