[linux] 01/01: [armel, armhf, s390x, x86] linux-headers: Fix regression of multilib compiler support

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit cfe4a19c0deed50bdb391508aa8a4c0e2bd02298
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jan 15 17:21:12 2017 +0000

    [armel,armhf,s390x,x86] linux-headers: Fix regression of multilib compiler support
    
    Closes: #851481
    
    I missed the linux-headers dependency overrides when updating to gcc-6.
---
 debian/changelog            | 4 ++++
 debian/config/amd64/defines | 2 +-
 debian/config/armel/defines | 2 +-
 debian/config/armhf/defines | 2 +-
 debian/config/i386/defines  | 2 +-
 debian/config/s390x/defines | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c79456d..f1a5d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -177,6 +177,10 @@ linux (4.9.3-1) UNRELEASED; urgency=medium
     - Revert "usb: gadget: composite: always set ep->mult to a sensible value"
     - usb: gadget: composite: always set ep->mult to a sensible value
 
+  [ Ben Hutchings ]
+  * [armel,armhf,s390x,x86] linux-headers: Fix regression of multilib compiler
+    support (Closes: #851481)
+
  -- Salvatore Bonaccorso <carnil at debian.org>  Sun, 15 Jan 2017 14:48:41 +0100
 
 linux (4.9.2-2) unstable; urgency=medium
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 438bc1e..e15f609 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -15,7 +15,7 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-x86
+headers%gcc-6: linux-compiler-gcc-6-x86
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 912932c..60ced19 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -14,7 +14,7 @@ signed-modules: false
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-arm
+headers%gcc-6: linux-compiler-gcc-6-arm
 
 [marvell_description]
 hardware: Marvell Kirkwood/Orion
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index cfc0825..6cb4658 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -12,7 +12,7 @@ vdso: true
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-arm
+headers%gcc-6: linux-compiler-gcc-6-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 414dbae..1123508 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -20,7 +20,7 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-x86
+headers%gcc-6: linux-compiler-gcc-6-x86
 
 [686_description]
 hardware: older PCs
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 7131bd0..8dcf9fd 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -12,7 +12,7 @@ bootloaders: s390-tools
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-s390
+headers%gcc-6: linux-compiler-gcc-6-s390
 
 [s390x_build]
 debug-info: true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git