sync with Debian

debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/tools/perf/arch/x86/util/unwind-libunwind.c
 +++ b/tools/perf/arch/x86/util/unwind-libunwind.c
-@@ -67,7 +67,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
+@@ -66,7 +66,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
  		break;
  	default:
  		pr_err("unwind: invalid reg id %d\n", regnum);
@@ -24,7 +24,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	}
  
  	return id;
-@@ -107,7 +107,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
+@@ -106,7 +106,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
  		break;
  	default:
  		pr_err("unwind: invalid reg id %d\n", regnum);

debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch

@@ -1,22 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 25 Sep 2015 22:50:50 +0100
-Subject: Revert "perf build: Fix libunwind feature detection on 32-bit x86"
-Forwarded: no
-
-This reverts commit 05b41775e2edd69a83f592e3534930c934d4038e.
-It broke feature detection that was working just fine for us.
----
- tools/perf/Makefile.config | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tools/perf/Makefile.config
-+++ b/tools/perf/Makefile.config
-@@ -56,7 +56,7 @@ ifeq ($(SRCARCH),x86)
-     LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma
-     $(call detected,CONFIG_X86_64)
-   else
--    LIBUNWIND_LIBS = -lunwind-x86 -llzma -lunwind
-+    LIBUNWIND_LIBS = -lunwind -lunwind-x86
-   endif
- endif
- 

debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch

@@ -16,7 +16,7 @@ un-blacklist it in udev.
 ---
 --- a/drivers/video/fbdev/via/via-core.c
 +++ b/drivers/video/fbdev/via/via-core.c
-@@ -700,7 +700,14 @@ static const struct pci_device_id via_pc
+@@ -695,7 +695,14 @@ static const struct pci_device_id via_pc
  	  .driver_data = UNICHROME_VX900 },
  	{ }
  };