[linux] 02/04: Revert "Compile with gcc-5 on all architectures"

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Thu Apr 21 10:29:19 UTC 2016


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

zumbi pushed a commit to branch jessie-backports
in repository linux.

commit 1c863ab4468ccc46f5c0fa89cf24631eeee07d9b
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Wed Apr 20 14:08:54 2016 +0200

    Revert "Compile with gcc-5 on all architectures"
    
    This reverts commit 641aba831145b61e69b86c9760c2f424b80aeda9.
---
 debian/changelog                  | 563 +++++++++++++++++++-------------------
 debian/config/amd64/defines       |   1 +
 debian/config/armel/defines       |   2 +-
 debian/config/armhf/defines       |   2 +-
 debian/config/defines             |   2 +-
 debian/config/hppa/defines        |   2 +-
 debian/config/i386/defines        |   1 +
 debian/config/m68k/defines        |   1 +
 debian/config/s390x/defines       |   2 +-
 debian/templates/control.extra.in |  12 +-
 10 files changed, 291 insertions(+), 297 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 01e0379..2faa111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -377,7 +377,6 @@ linux (4.5~rc4-1~exp1) experimental; urgency=medium
   [ Ben Hutchings ]
   * [rt] Disable until it is updated for 4.5 or later
   * aufs: Update support patches to aufs4.x-rcN-20160215
-  * Compile with gcc-5 on all architectures
   * [hppa] Update build-dependencies for renaming of binutils-hppa64
   * [x86] udeb: Move scsi_transport_fc to scsi-core-modules, since hv_storvsc
     now depends on it
@@ -1049,7 +1048,7 @@ linux (4.4.2-3) unstable; urgency=medium
 linux-tools (4.4-2) unstable; urgency=medium
 
   * linux-perf: Include version number in strace groups installation directory
-    (Closes: #813080)
+  (Closes: #813080)
   * [alpha,sh4] Attempt to fix build failures
   * Build fixdep under debian/build and clean it up properly
 
@@ -1059,11 +1058,11 @@ linux (4.4.2-2) unstable; urgency=medium
 
   [ Ben Hutchings ]
   * udeb: Make DAC960 and cciss optional in scsi-modules again
-    (fixes FTBFS on armhf, arm64)
+  (fixes FTBFS on armhf, arm64)
   * [armel,armhf] net: mv643xx_eth: fix packet corruption with TSO and tiny
-    unaligned packets. (Closes: #814681)
+  unaligned packets. (Closes: #814681)
   * [mipsel/loongson-2f] udeb: Add i2c-modules to avoid duplicate modules
-
+  
   [ Martin Michlmayr ]
   * [arm64] Create i2c-modules udeb to avoid duplicate modules.
 
@@ -1078,78 +1077,78 @@ linux-tools (4.4-1) unstable; urgency=medium
 linux (4.4.2-1) unstable; urgency=medium
 
   * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.2
-    - ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-2384)
-
+  https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.2
+  - ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-2384)
+  
   [ Ben Hutchings ]
   * Set ABI to 1
   * iw_cxgb3: Fix incorrectly returning error on success (CVE-2015-8812)
   * fs/hugetlbfs/inode.c: fix bugs in hugetlb_vmtruncate_list() (CVE-2016-0617)
-    (regression in 4.3)
+  (regression in 4.3)
   * af_unix: Guard against other == sk in unix_dgram_sendmsg
-    (regression in 4.2.6-2)
+  (regression in 4.2.6-2)
   * Revert "workqueue: make sure delayed work run in local cpu"
-    (regression in 4.3)
+  (regression in 4.3)
   * af_unix: Don't set err in unix_stream_read_generic unless there was an error
-    (regression in 4.4, 4.3.4)
+  (regression in 4.4, 4.3.4)
   * bpf: fix branch offset adjustment on backjumps after patching ctx expansion
-    (CVE-2016-2383)
+  (CVE-2016-2383)
   * udeb: Combine scsi-{common,extra}-modules with scsi-modules
   * udeb: Use wildcards to include entire classes of drivers:
-    - input-modules: Include HID drivers by default
-    - nic{,-pcmcia,-usb,-wireless}-modules: Include Ethernet, USB and wireless
-      drivers by default
-    - {pata,sata}-modules: Include ATA drivers by default
-    - sound-modules: Include sound drivers by default
-    - scsi-modules: Include SCSI drivers by default
-    - usb-modules: Include USB host drivers by default
-    - usb-serial-modules: Include USB serial drivers by default
-    - usb-storage-modules: Include USB storage drivers by default
+  - input-modules: Include HID drivers by default
+  - nic{,-pcmcia,-usb,-wireless}-modules: Include Ethernet, USB and wireless
+    drivers by default
+  - {pata,sata}-modules: Include ATA drivers by default
+  - sound-modules: Include sound drivers by default
+  - scsi-modules: Include SCSI drivers by default
+  - usb-modules: Include USB host drivers by default
+  - usb-serial-modules: Include USB serial drivers by default
+  - usb-storage-modules: Include USB storage drivers by default
   * udeb: Remove some obsolete drivers:
-    - nic-modules: Remove FDDI and HIPPI drivers, and inet_lro module
-    - nic-pcmcia-modules: Remove Arcnet drivers
+  - nic-modules: Remove FDDI and HIPPI drivers, and inet_lro module
+  - nic-pcmcia-modules: Remove Arcnet drivers
   * udeb: Move most USB wireless drivers from nic-usb-modules to
-    nic-wireless-modules
+  nic-wireless-modules
   * udeb: Really add virtio_input to virtio-modules (not input-modules)
   * [x86] Fix issues resulting in W+X pages:
-    - [amd64] efi: Build our own page table structure
-    - [i386/686-pae] mm: Fix types used in pgprot cacheability flags
-      translations
-    - [i386/686-pae] PCI: Set pci=nobios by default
+  - [amd64] efi: Build our own page table structure
+  - [i386/686-pae] mm: Fix types used in pgprot cacheability flags
+    translations
+  - [i386/686-pae] PCI: Set pci=nobios by default
   * IFF_NO_QUEUE: Fix for drivers not calling ether_setup() (regression in 4.3)
   * udeb: Fix issues with wildcards that caused FTBFS on armhf, thanks to
-    Karsten Merker
-
+  Karsten Merker
+  
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
-
+  
   [ Uwe Kleine-König ]
   * [rt] Update to 4.4.1-rt6
-
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 17 Feb 2016 21:20:12 +0000
 
 linux (4.4.1-1~exp1) experimental; urgency=medium
 
   * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.1
-
+  https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.1
+  
   [ Ricardo Salveti ]
   * Extending ARM64 support:
-    - config: enabling support for the AMD Seattle platform
-    - nic-modules: adding amd-xgbe
-    - sata-modules: adding ahci_platform, required by AMD Overdrive
-    - config: enabling the cpuidle ARM driver
-    - config: enable multi-core scheduler support by default
-    - config: enable PCI generic host bridge by default
-    - config: enable CRYPTO_CRC32_ARM64 by default
-
+  - config: enabling support for the AMD Seattle platform
+  - nic-modules: adding amd-xgbe
+  - sata-modules: adding ahci_platform, required by AMD Overdrive
+  - config: enabling the cpuidle ARM driver
+  - config: enable multi-core scheduler support by default
+  - config: enable PCI generic host bridge by default
+  - config: enable CRYPTO_CRC32_ARM64 by default
+  
   [ Ian Campbell ]
   * [arm64] Enabled support for QCOM platforms, options recommended by Martin
-    Michlmayr. (Closes: #812386)
+  Michlmayr. (Closes: #812386)
   * [armel/marvell] Declare breaks against flash-kernel << 3.57~ in order to
-    force a version which understands about the merge of kirkwood and orion5x
-    flavours into marvell.
-
+  force a version which understands about the merge of kirkwood and orion5x
+  flavours into marvell.
+  
   [ Ben Hutchings ]
   * linux-image: Make failure of depmod fatal, rather than asking what to do
   * [mips*] linux-image: Remove debconf question for requirement of initramfs
@@ -1158,24 +1157,24 @@ linux (4.4.1-1~exp1) experimental; urgency=medium
   * linux-headers: Make postinst script less verbose (see: #734266)
   * [armel] Replace kirkwood and orion5x flavours with a 'marvell' flavour
   * [armel/marvell] Adjust configuration to reduce image size:
-    - Disable support for DNS-323 as the kernel image was already too large
-      for this machine
-      + Disable MACH_DNS323
-      + Change MTD_CFI_AMDSTD from built-in to module
-    - input: Disable KEYBOARD_ATKBD
-    - mtd: Change JFFS2_FS, MTD_SPI_NOR, and M25P80 from built-in to modules
+  - Disable support for DNS-323 as the kernel image was already too large
+    for this machine
+    + Disable MACH_DNS323
+    + Change MTD_CFI_AMDSTD from built-in to module
+  - input: Disable KEYBOARD_ATKBD
+  - mtd: Change JFFS2_FS, MTD_SPI_NOR, and M25P80 from built-in to modules
   * [rt] Update to 4.4.1-rt5:
-    - genirq: Add default affinity mask command line option
-    - latencyhist: disable jump-labels
-    - kernel/perf: mark perf_cpu_context's timer as irqsafe
+  - genirq: Add default affinity mask command line option
+  - latencyhist: disable jump-labels
+  - kernel/perf: mark perf_cpu_context's timer as irqsafe
   * bnx2x: Enable BNX2X_VXLAN
   * cgroups: Enable CGROUP_PIDS
   * crypto: Enable CRYPTO_CHACHA20, CRYPTO_POLY1305, CRYPTO_CHACHA20POLY1305,
-    CRYPTO_USER_API_AEAD as modules
+  CRYPTO_USER_API_AEAD as modules
   * [x86] crypto: Enable CRYPTO_DEV_QAT_DH895xCC, CRYPTO_DEV_QAT_DH895xCCVF
-    as modules
+  as modules
   * [amd64] crypto: Enable CRYPTO_CHACHA20_X86_64, CRYPTO_DES3_EDE_X86_64,
-    CRYPTO_POLY1305_X86_64 as modules
+  CRYPTO_POLY1305_X86_64 as modules
   * [x86] dmaengine: Enable INTEL_IDMA64 as module
   * debug: Enable SCHED_STACK_END_CHECK
   * dm-cache: Enable DM_CACHE_SMQ as module
@@ -1193,12 +1192,12 @@ linux (4.4.1-1~exp1) experimental; urgency=medium
   * [amd64] mic: Enable INTEL_MIC_X100_DMA, MIC_COSM, SCIF, SCIF_BUS as modules
   * [powerpc*/*64*] misc: Enable GENWQE as module
   * net: Enable LWTUNNEL, NET_L3_MASTER_DEV; and MPLS_IPTUNNEL, NET_VRF
-    as modules
+  as modules
   * [amd64] net: Enable FUJITSU_ES as module
   * netfilter: Really enable NF_TABLES_NETDEV, NFT_REDIR_IPV4, NFT_REDIR_IPV6
-    as modules
+  as modules
   * net/phy: Enable AQUANTIA_PHY, DP83848_PHY, MICROCHIP_PHY, TERANETICS_PHY
-    as modules
+  as modules
   * net/sched: Really enable NET_CLS_FLOWER as module
   * net/usb: Enable USB_LAN78XX, USB_NET_CH9200 as modules
   * nfsd: Enable NFSD_PNFS
@@ -1207,23 +1206,23 @@ linux (4.4.1-1~exp1) experimental; urgency=medium
   * serial: Enable SERIAL_OF_PLATFORM as module
   * sound/firewire: Enable SND_FIREWIRE_DIGI00X, SND_FIREWIRE_TASCAM as modules
   * [x86] thermal: Enable INTEL_PCH_THERMAL, INTEL_SOC_DTS_THERMAL as modules;
-    disable THERMAL_OF
+  disable THERMAL_OF
   * [x86] Enable INTEL_PMC_IPC as module
   * vfs,nvdimm: Really enable FS_DAX
   * [amd64] mm,nvdimm: Disable ZONE_DMA; enable ZONE_DEVICE, NVDIMM_PFN
-    - This disables drivers for some AC'97 sound cards
+  - This disables drivers for some AC'97 sound cards
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 10 Feb 2016 02:02:14 +0000
 
 linux (4.4-1~exp1) experimental; urgency=medium
 
   * New upstream release: http://kernelnewbies.org/Linux_4.4
-
+  
   [ Ben Hutchings ]
   * [armhf] Enable EXTCON_USB_GPIO, ENSORS_GPIO_FAN as modules, and
-    USB_DWC3_DUAL_ROLE instead of USB_DWC3_HOST (Closes: #810048)
+  USB_DWC3_DUAL_ROLE instead of USB_DWC3_HOST (Closes: #810048)
   * [rt] Update to 4.4-rt2
-
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 19 Jan 2016 22:25:06 +0000
 
 linux-tools (4.4-1~exp2) experimental; urgency=medium
@@ -1235,88 +1234,88 @@ linux-tools (4.4-1~exp2) experimental; urgency=medium
 linux-tools (4.4-1~exp1) experimental; urgency=medium
 
   * New upstream release
-
+  
   [ Ben Hutchings ]
   * linux-perf: Fix reading of build-id from vDSO
   * linux-perf: Leave -rc suffix out of version in package description
   * debian.py: Implement stable order of fields not in the predefined order
   * genorig.py: Make orig tarballs really reproducible:
-    - Override umask while extracting/exporting files
-    - Override user and group names in tarball
-
+  - Override umask while extracting/exporting files
+  - Override user and group names in tarball
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 19 Jan 2016 00:31:02 +0000
 
 linux (4.4~rc8-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
-
+  
   [ Ben Hutchings ]
   * [rt] Update to 4.4-rc6-rt1 and re-enable
   * [rt] Fix build error in kernel/time/hrtimer.c
   * [rt] latency_hist: Update sched_switch probe
   * [armhf] Add support for BCM2836 and Raspberry Pi 2:
-    - pwm: bcm2835: Calculate scaler in ->config()
-    - pwm: bcm2835: Prevent division by zero
-    - drm: Create a driver hook for allocating GEM object structs
-    - drm/vc4: Add a BO cache
-    - drm/vc4: Add create and map BO ioctls
-    - drm/vc4: Add an API for creating GPU shaders in GEM BOs
-    - drm/vc4: Fix a typo in a V3D debug register
-    - drm/vc4: Bind and initialize the V3D engine
-    - drm/vc4: Add support for drawing 3D frames
-    - drm/vc4: Add support for async pageflips
-    - drm/vc4: Add an interface for capturing the GPU state after a hang
-    - drm/vc4: copy_to_user() returns the number of bytes remaining
-    - drm/vc4: allocate enough memory in vc4_save_hang_state()
-    - drm/vc4: fix an error code
-    - bcm2835: Add a compat string for bcm2836 machine probe
-    - bcm2835: Add Kconfig support for bcm2836
-    - bcm2835: Define two new packets from the latest firmware
-    - bcm2835: add rpi power domain driver
-    - bcm2835: Split the DT for peripherals from the DT for the CPU
-    - bcm2835: Move the CPU/peripheral include out of common RPi DT
-    - bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B
-    - bcm2835: Add the auxiliary clocks to the device tree
-    - Enable ARCH_BCM, ARCH_BCM2835, DMA_BCM2835, BCM2835_MBOX,
-      RASPBERRYPI_FIRMWARE, RASPBERRYPI_POWER
-    - Enable DRM_VC4, I2C_BCM2835, MMC_SDHCI_BCM2835, PWM_BCM2835, SPI_BCM2835,
-      SPI_BCM2835AUX, USB_DWC2, BCM2835_WDT, SND_BCM2835_SOC_I2S as modules
-    - udeb: Add sdhci-bcm2835 to mmc-modules, dwc2 to usb-modules
+  - pwm: bcm2835: Calculate scaler in ->config()
+  - pwm: bcm2835: Prevent division by zero
+  - drm: Create a driver hook for allocating GEM object structs
+  - drm/vc4: Add a BO cache
+  - drm/vc4: Add create and map BO ioctls
+  - drm/vc4: Add an API for creating GPU shaders in GEM BOs
+  - drm/vc4: Fix a typo in a V3D debug register
+  - drm/vc4: Bind and initialize the V3D engine
+  - drm/vc4: Add support for drawing 3D frames
+  - drm/vc4: Add support for async pageflips
+  - drm/vc4: Add an interface for capturing the GPU state after a hang
+  - drm/vc4: copy_to_user() returns the number of bytes remaining
+  - drm/vc4: allocate enough memory in vc4_save_hang_state()
+  - drm/vc4: fix an error code
+  - bcm2835: Add a compat string for bcm2836 machine probe
+  - bcm2835: Add Kconfig support for bcm2836
+  - bcm2835: Define two new packets from the latest firmware
+  - bcm2835: add rpi power domain driver
+  - bcm2835: Split the DT for peripherals from the DT for the CPU
+  - bcm2835: Move the CPU/peripheral include out of common RPi DT
+  - bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B
+  - bcm2835: Add the auxiliary clocks to the device tree
+  - Enable ARCH_BCM, ARCH_BCM2835, DMA_BCM2835, BCM2835_MBOX,
+    RASPBERRYPI_FIRMWARE, RASPBERRYPI_POWER
+  - Enable DRM_VC4, I2C_BCM2835, MMC_SDHCI_BCM2835, PWM_BCM2835, SPI_BCM2835,
+    SPI_BCM2835AUX, USB_DWC2, BCM2835_WDT, SND_BCM2835_SOC_I2S as modules
+  - udeb: Add sdhci-bcm2835 to mmc-modules, dwc2 to usb-modules
   * [armhf] Enable INPUT_AXP20X_PEK, CAN_SUN4I, SND_SUN4I_CODEC as modules
-    (Closes: #808623)
+  (Closes: #808623)
   * [x86] nvdimm: Change X86_PMEM_LEGACY from built-in to module
   * [x86] Enable DEBUG_WX, X86_INTEL_MPX
-
+  
   [ Ian Campbell ]
   * [armel/kirkwood] Updates/clarifications to kernel size limitations from
-    Martin Michlmayr. (Closes: #809528)
+  Martin Michlmayr. (Closes: #809528)
   * [armhf] Enable support for Rockchip devices. (Closes: #809083)
   * [armhf] Enable basic support for DRA7XX systems, such as Beagle-x15.
-    (Closes: #807624)
-
+  (Closes: #807624)
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 04 Jan 2016 17:23:28 +0000
 
 linux (4.4~rc6-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
-    - include/linux/mmdebug.h: should include linux/bug.h
-      (fixes FTBFS on arm64)
-
+  - include/linux/mmdebug.h: should include linux/bug.h
+    (fixes FTBFS on arm64)
+  
   [ Ben Hutchings ]
   * [sparc64] udeb: Replace mpt2sas with mpt3sas in scsi-common-modules
-    (fixes FTBFS)
-
+  (fixes FTBFS)
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 21 Dec 2015 17:30:10 +0000
 
 linux (4.4~rc5-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
-
+  
   [ Ben Hutchings ]
   * [arm64] Drop now-redundant patches for X-Gene (fixes FTBFS)
   * [s390x] udeb: Add crc-modules package (fixes FTBFS)
   * cirrus,mgag200: Drop patches for compatibility with wheezy userland
-
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 16 Dec 2015 17:16:09 +0000
 
 linux-tools (4.4~rc4-1~exp1) experimental; urgency=medium
@@ -1328,177 +1327,177 @@ linux-tools (4.4~rc4-1~exp1) experimental; urgency=medium
 linux (4.4~rc4-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
-
+  
   [ Ben Hutchings ]
   * aufs: Update support patches to aufs4.x-rcN-20151123
   * udeb: Make md-modules depend on crc-modules (Closes: #807661)
   * [armel/kirkwood,armhf] crypto: Enable CRYPTO_DEV_MARVELL_CESA as module
-    (Closes: #807634)
+  (Closes: #807634)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 13 Dec 2015 16:25:45 +0000
 
 linux (4.3.5-1) unstable; urgency=medium
 
   * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.3.4
-    - toshiba_acpi: Initialize hotkey_event_type variable (regression in 4.3)
-    - USB: add quirk for devices with broken LPM
-    - usb: core : hub: Fix BOS 'NULL pointer' kernel panic
-    - pppoe: fix memory corruption in padt work structure (regression in 4.1)
-    - ipv6: keep existing flags when setting IFA_F_OPTIMISTIC
-      (regression in 4.1)
-    - vxlan: fix incorrect RCO bit in VXLAN header (regression in 4.0)
-    - sctp: update the netstamp_needed counter when copying sockets
-    - sctp: also copy sk_tsflags when copying the socket (regression in 3.17)
-    - r8152: fix lockup when runtime PM is enabled (regression in 4.2)
-    - ipv6: sctp: clone options to avoid use after free
-    - phy: micrel: Fix finding PHY properties in MAC node. (regression in 4.2)
-    - openvswitch: Fix helper reference leak
-    - openvswitch: Respect conntrack zone even if invalid
-    - net: fix IP early demux races
-    - vlan: Fix untag operations of stacked vlans with REORDER_HEADER off
-    - skbuff: Fix offset error in skb_reorder_vlan_header
-    - net: check both type and procotol for tcp sockets
-    - net_sched: make qdisc_tree_decrease_qlen() work for non mq
-      (regression in 4.3.3)
-    - net: fix uninitialized variable issue
-    - ipv6: automatically enable stable privacy mode if stable_secret set
-    - inet: tcp: fix inetpeer_set_addr_v4() (regression in 4.3)
-    - rhashtable: Enforce minimum size on initial hash table (regression in 4.1)
-    - fou: clean up socket with kfree_rcu
-    - af_unix: Revert 'lock_interruptible' in stream receive code
-    - tcp: restore fastopen with no data in SYN packet (regression in 4.0)
-    - rhashtable: Fix walker list corruption (regression in 4.1)
-    https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.3.5
-    - [x86] mpx: Fix instruction decoder condition
-    - [x86] signal: Fix restart_syscall number for x32 tasks
-    - [x86] paravirt: Prevent rtc_cmos platform device init on PV guests
-      (regression in 4.2)
-    - [powerpc*] KVM: Book3S HV: Don't dynamically split core when already split
-      (regression in 4.3)
-    - [powerpc*] KVM: Book3S HV: Prohibit setting illegal transaction state
-      in MSR
-    - [x86] boot: Double BOOT_HEAP_SIZE to 64KB
-    - [x86] mm: Add barriers and document switch_mm()-vs-flush synchronization
-      (CVE-2016-2069)
-    - timers: Use proper base migration in add_timer_on()
-    - ipmi: move timer init to before irq is setup
-    - ALSA: hda - Disable 64bit address for Creative HDA controllers
-    - ALSA: hda - Fix lost 4k BDL boundary workaround (regression in 4.2)
-    - [x86] ALSA: hda - Fix noise on Dell Latitude E6440 (regression in 4.1)
-    - ALSA: hda - Skip ELD notification during system suspend
-      (regression in 4.3)
-    - ALSA: seq: Fix missing NULL check at remove_events ioctl
-    - ALSA: usb-audio: Avoid calling usb_autopm_put_interface() at disconnect
-    - ALSA: seq: Fix race at timer setup and close
-    - [x86] ALSA: hda - Fix white noise on Dell Latitude E5550
-      (regression in 4.1)
-    - ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices
-      (regression in 3.19)
-    - ALSA: timer: Harden slave timer list handling
-    - ALSA: timer: Fix race among timer ioctls
-    - ALSA: timer: Fix double unlink of active_list
-    - [x86] ALSA: hda - Add fixup for Dell Latitidue E6540 (regression in 4.1)
-    - ALSA: seq: Fix snd_seq_call_port_info_ioctl in compat mode
-    - ALSA: pcm: Fix snd_pcm_hw_params struct copy in compat mode
-    - ALSA: control: Avoid kernel warnings from tlv ioctl with numid 0
-    - ALSA: timer: Handle disconnection more safely
-    - ASoC: rt286: Fix run time error while modifying const data
-      (regression in 4.3)
-    - airspy: increase USB control message buffer size (regression in 3.17)
-    - USB: fix invalid memory access in hub_activate()
-    - openvswitch: correct encoding of set tunnel action attributes
-      (regression in 4.3)
-    - veth: don’t modify ip_summed; doing so treats packets with bad checksums
-      as good.
-    - ipv6/addrlabel: fix ip6addrlbl_get()
-    - addrconf: always initialize sysctl table data
-    - connector: bump skb->users before callback invocation
-    - af_unix: Fix splice-bind deadlock
-    - bridge: Only call /sbin/bridge-stp for the initial network namespace
-    - net: filter: make JITs zero A for SKF_AD_ALU_XOR_X (regression in 3.16)
-    - net: sched: fix missing free per cpu on qstats (regression in 3.18)
-    - net: possible use after free in dst_release
-    - tcp: fix zero cwnd in tcp_cwnd_reduction (CVE-2016-2070)
-      (regression in 4.3)
-    - net: sctp: prevent writes to cookie_hmac_alg from accessing invalid memory
-    - ipv6: tcp: add rcu locking in tcp_v6_send_synack()
-    - tcp_yeah: don't set ssthresh below 2
-    - udp: disallow UFO for sockets with SO_NO_CHECK option (regression in 4.0)
-    - net: preserve IP control block during GSO segmentation
-    - phonet: properly unshare skbs in phonet_rcv() (regression in 4.0)
-    - net: bpf: reject invalid shifts
-    - ipv6: update skb->csum when CE mark is propagated
-    - batman-adv: Avoid recursive call_rcu for batadv_bla_claim
-    - batman-adv: Avoid recursive call_rcu for batadv_nc_node
-    - batman-adv: Drop immediate batadv_orig_ifinfo free function
-    - batman-adv: Drop immediate batadv_neigh_node free function
-    - batman-adv: Drop immediate neigh_ifinfo free function
-    - batman-adv: Drop immediate batadv_hard_iface free function
-    - batman-adv: Drop immediate orig_node free function
-    - team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid
-    - xfrm: dst_entries_init() per-net dst_ops
-    - [powerpc*] tm: Block signal return setting invalid MSR state
-    - [powerpc*] tm: Check for already reclaimed tasks
-    - [ppc64el] opal-irqchip: Fix double endian conversion (regression in 4.2)
-    - [powerpc*] opal-irqchip: Fix deadlock introduced by "Fix double endian
-      conversion"
-    - [powerpc*] powernv: pr_warn_once on unsupported OPAL_MSG type
-    - [powerpc*] Make value-returning atomics fully ordered
-    - [powerpc*] Make {cmp}xchg* and their atomic_ versions fully ordered
-    - [arm64] bpf: fix div-by-zero case
-    - [arm64] bpf: fix mod-by-zero case
-    - [arm64] cmpxchg_dbl: fix return value type (regression in 4.3)
-    - [arm*] KVM: test properly for a PTE's uncachedness
-    - [arm64] KVM: Fix AArch32 to AArch64 register mapping
-    - [arm*] KVM: correct PTE uncachedness check
-    - [arm64] kernel: enforce pmuserenr_el0 initialization and restore
-    - [arm*] iommu/arm-smmu: Fix error checking for ASID and VMID allocation
-    - HID: wacom: Tie cached HID_DG_CONTACTCOUNT indices to report ID
-      (regression in 4.3)
-    - HID: wacom: Expect 'touch_max' touches if HID_DG_CONTACTCOUNT not present
-      (regression in 4.3)
-    - HID: core: Avoid uninitialized buffer access
-    - staging: lustre: echo_copy.._lsm() dereferences userland pointers directly
-    - direct-io: Fix negative return from dio read beyond eof
-    - fix the regression from "direct-io: Fix negative return from dio read
-      beyond eof"
-    - [arm64] KVM: Add workaround for Cortex-A57 erratum 834220
-    - [arm64] kernel: fix architected PMU registers unconditional access
-
+  https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.3.4
+  - toshiba_acpi: Initialize hotkey_event_type variable (regression in 4.3)
+  - USB: add quirk for devices with broken LPM
+  - usb: core : hub: Fix BOS 'NULL pointer' kernel panic
+  - pppoe: fix memory corruption in padt work structure (regression in 4.1)
+  - ipv6: keep existing flags when setting IFA_F_OPTIMISTIC
+    (regression in 4.1)
+  - vxlan: fix incorrect RCO bit in VXLAN header (regression in 4.0)
+  - sctp: update the netstamp_needed counter when copying sockets
+  - sctp: also copy sk_tsflags when copying the socket (regression in 3.17)
+  - r8152: fix lockup when runtime PM is enabled (regression in 4.2)
+  - ipv6: sctp: clone options to avoid use after free
+  - phy: micrel: Fix finding PHY properties in MAC node. (regression in 4.2)
+  - openvswitch: Fix helper reference leak
+  - openvswitch: Respect conntrack zone even if invalid
+  - net: fix IP early demux races
+  - vlan: Fix untag operations of stacked vlans with REORDER_HEADER off
+  - skbuff: Fix offset error in skb_reorder_vlan_header
+  - net: check both type and procotol for tcp sockets
+  - net_sched: make qdisc_tree_decrease_qlen() work for non mq
+    (regression in 4.3.3)
+  - net: fix uninitialized variable issue
+  - ipv6: automatically enable stable privacy mode if stable_secret set
+  - inet: tcp: fix inetpeer_set_addr_v4() (regression in 4.3)
+  - rhashtable: Enforce minimum size on initial hash table (regression in 4.1)
+  - fou: clean up socket with kfree_rcu
+  - af_unix: Revert 'lock_interruptible' in stream receive code
+  - tcp: restore fastopen with no data in SYN packet (regression in 4.0)
+  - rhashtable: Fix walker list corruption (regression in 4.1)
+  https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.3.5
+  - [x86] mpx: Fix instruction decoder condition
+  - [x86] signal: Fix restart_syscall number for x32 tasks
+  - [x86] paravirt: Prevent rtc_cmos platform device init on PV guests
+    (regression in 4.2)
+  - [powerpc*] KVM: Book3S HV: Don't dynamically split core when already split
+    (regression in 4.3)
+  - [powerpc*] KVM: Book3S HV: Prohibit setting illegal transaction state
+    in MSR
+  - [x86] boot: Double BOOT_HEAP_SIZE to 64KB
+  - [x86] mm: Add barriers and document switch_mm()-vs-flush synchronization
+    (CVE-2016-2069)
+  - timers: Use proper base migration in add_timer_on()
+  - ipmi: move timer init to before irq is setup
+  - ALSA: hda - Disable 64bit address for Creative HDA controllers
+  - ALSA: hda - Fix lost 4k BDL boundary workaround (regression in 4.2)
+  - [x86] ALSA: hda - Fix noise on Dell Latitude E6440 (regression in 4.1)
+  - ALSA: hda - Skip ELD notification during system suspend
+    (regression in 4.3)
+  - ALSA: seq: Fix missing NULL check at remove_events ioctl
+  - ALSA: usb-audio: Avoid calling usb_autopm_put_interface() at disconnect
+  - ALSA: seq: Fix race at timer setup and close
+  - [x86] ALSA: hda - Fix white noise on Dell Latitude E5550
+    (regression in 4.1)
+  - ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices
+    (regression in 3.19)
+  - ALSA: timer: Harden slave timer list handling
+  - ALSA: timer: Fix race among timer ioctls
+  - ALSA: timer: Fix double unlink of active_list
+  - [x86] ALSA: hda - Add fixup for Dell Latitidue E6540 (regression in 4.1)
+  - ALSA: seq: Fix snd_seq_call_port_info_ioctl in compat mode
+  - ALSA: pcm: Fix snd_pcm_hw_params struct copy in compat mode
+  - ALSA: control: Avoid kernel warnings from tlv ioctl with numid 0
+  - ALSA: timer: Handle disconnection more safely
+  - ASoC: rt286: Fix run time error while modifying const data
+    (regression in 4.3)
+  - airspy: increase USB control message buffer size (regression in 3.17)
+  - USB: fix invalid memory access in hub_activate()
+  - openvswitch: correct encoding of set tunnel action attributes
+    (regression in 4.3)
+  - veth: don’t modify ip_summed; doing so treats packets with bad checksums
+    as good.
+  - ipv6/addrlabel: fix ip6addrlbl_get()
+  - addrconf: always initialize sysctl table data
+  - connector: bump skb->users before callback invocation
+  - af_unix: Fix splice-bind deadlock
+  - bridge: Only call /sbin/bridge-stp for the initial network namespace
+  - net: filter: make JITs zero A for SKF_AD_ALU_XOR_X (regression in 3.16)
+  - net: sched: fix missing free per cpu on qstats (regression in 3.18)
+  - net: possible use after free in dst_release
+  - tcp: fix zero cwnd in tcp_cwnd_reduction (CVE-2016-2070)
+    (regression in 4.3)
+  - net: sctp: prevent writes to cookie_hmac_alg from accessing invalid memory
+  - ipv6: tcp: add rcu locking in tcp_v6_send_synack()
+  - tcp_yeah: don't set ssthresh below 2
+  - udp: disallow UFO for sockets with SO_NO_CHECK option (regression in 4.0)
+  - net: preserve IP control block during GSO segmentation
+  - phonet: properly unshare skbs in phonet_rcv() (regression in 4.0)
+  - net: bpf: reject invalid shifts
+  - ipv6: update skb->csum when CE mark is propagated
+  - batman-adv: Avoid recursive call_rcu for batadv_bla_claim
+  - batman-adv: Avoid recursive call_rcu for batadv_nc_node
+  - batman-adv: Drop immediate batadv_orig_ifinfo free function
+  - batman-adv: Drop immediate batadv_neigh_node free function
+  - batman-adv: Drop immediate neigh_ifinfo free function
+  - batman-adv: Drop immediate batadv_hard_iface free function
+  - batman-adv: Drop immediate orig_node free function
+  - team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid
+  - xfrm: dst_entries_init() per-net dst_ops
+  - [powerpc*] tm: Block signal return setting invalid MSR state
+  - [powerpc*] tm: Check for already reclaimed tasks
+  - [ppc64el] opal-irqchip: Fix double endian conversion (regression in 4.2)
+  - [powerpc*] opal-irqchip: Fix deadlock introduced by "Fix double endian
+    conversion"
+  - [powerpc*] powernv: pr_warn_once on unsupported OPAL_MSG type
+  - [powerpc*] Make value-returning atomics fully ordered
+  - [powerpc*] Make {cmp}xchg* and their atomic_ versions fully ordered
+  - [arm64] bpf: fix div-by-zero case
+  - [arm64] bpf: fix mod-by-zero case
+  - [arm64] cmpxchg_dbl: fix return value type (regression in 4.3)
+  - [arm*] KVM: test properly for a PTE's uncachedness
+  - [arm64] KVM: Fix AArch32 to AArch64 register mapping
+  - [arm*] KVM: correct PTE uncachedness check
+  - [arm64] kernel: enforce pmuserenr_el0 initialization and restore
+  - [arm*] iommu/arm-smmu: Fix error checking for ASID and VMID allocation
+  - HID: wacom: Tie cached HID_DG_CONTACTCOUNT indices to report ID
+    (regression in 4.3)
+  - HID: wacom: Expect 'touch_max' touches if HID_DG_CONTACTCOUNT not present
+    (regression in 4.3)
+  - HID: core: Avoid uninitialized buffer access
+  - staging: lustre: echo_copy.._lsm() dereferences userland pointers directly
+  - direct-io: Fix negative return from dio read beyond eof
+  - fix the regression from "direct-io: Fix negative return from dio read
+    beyond eof"
+  - [arm64] KVM: Add workaround for Cortex-A57 erratum 834220
+  - [arm64] kernel: fix architected PMU registers unconditional access
+  
   [ Ben Hutchings ]
   * fuse: break infinite loop in fuse_fill_write_pages() (CVE-2015-8785)
   * SCSI: fix crashes in sd and sr runtime PM (Closes: #801925)
   * rt2x00: fix monitor mode regression (regression in 4.2)
   * pipe: limit the per-user amount of pages allocated in pipes (CVE-2013-4312)
-    [Original reference is incorrect; should be CVE-2016-2847.]
+  [Original reference is incorrect; should be CVE-2016-2847.]
   * [powerpc*] Enable CRYPTO_DEV_VMX and enable CRYPTO_DEV_VMX_ENCRYPT as
-    module (Closes: #813640)
+  module (Closes: #813640)
   * debian/copyright: Add licence information for drivers/crypto/vmx/*.pl
   * udeb: Add hid-logitech-hidpp to input-modules (Closes: #796096)
   * hwrng: n2 - Attach on T5/M5, T7/M7 SPARC CPUs (Closes: #809815)
-
+  
   [ Salvatore Bonaccorso ]
   * netfilter: nf_nat_redirect: add missing NULL pointer check (CVE-2015-8787)
-
+  
   [ Aurelien Jarno ]
   * [mips*] Backport math emulation fix from 4.5.
   * [arm64] Enable RTC_DRV_EFI.
-
+  
   [ Hendrik Brueckner ]
   * [s390x] udeb: include modules to mount ISOs (loop device)
-    (Closes: #812336)
+  (Closes: #812336)
   * [s390x] udeb: include btrfs-modules (Closes: #812340)
-
+  
   [ Martin Michlmayr ]
   * Include Device Tree model in reportbug script
-
- -- Ben Hutchings <ben at decadent.org.uk>  Sat, 06 Feb 2016 23:25:14 +0000
+  
+   -- Ben Hutchings <ben at decadent.org.uk>  Sat, 06 Feb 2016 23:25:14 +0000
 
 linux (4.3.3-7) unstable; urgency=medium
 
   * linux-image-dbg: Don't rely on upstream makefile to make .build-id
-    links to vDSO debuginfo (fixes FTBFS on arm64, s390)
+  links to vDSO debuginfo (fixes FTBFS on arm64, s390)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 19 Jan 2016 17:29:21 +0000
 
@@ -1508,54 +1507,54 @@ linux (4.3.3-6) unstable; urgency=medium
   * debian.py: Implement stable order of fields in debian/tests/control
   * debian.py: Implement stable order of fields not in the predefined order
   * genorig.py: Make orig tarballs really reproducible:
-    - Override umask while extracting/exporting files
-    - Override user and group names in tarball
+  - Override umask while extracting/exporting files
+  - Override user and group names in tarball
   * xen/gntdev: Grant maps should not be subject to NUMA balancing
-    (Closes: #810472)
+  (Closes: #810472)
   * gpio: Enable GPIO_SYSFS wherever GPIOLIB is enabled (Closes: #810085)
   * [armhf] udeb: Include usbhid in input-modules (Closes: #809521)
   * linux-image-dbg: Include debugging symbols for VDSOs
   * [armel/kirkwood] power/reset: Re-enable POWER_RESET, POWER_RESET_GPIO
-    (regression in 3.17~rc5-1~exp1)
+  (regression in 3.17~rc5-1~exp1)
   * usb: serial: visor: fix crash on detecting device without write_urbs
-    (CVE-2015-7566)
+  (CVE-2015-7566)
   * tty: Fix unsafe ldisc reference via ioctl(TIOCGETD) (CVE-2016-0723)
   * [x86] drm/vmwgfx: Fix a width / pitch mismatch on framebuffer updates
   * bcache: Add upstream fixes marked for stable:
-    - fix a livelock when we cause a huge number of cache misses
-    - Add a cond_resched() call to gc
-    - clear BCACHE_DEV_UNLINK_DONE flag when attaching a backing device
-    - fix a leak in bch_cached_dev_run()
-    - unregister reboot notifier if bcache fails to unregister device
-    - allows use of register in udev to avoid "device_busy" error.
-    - prevent crash on changing writeback_running
-    - Change refill_dirty() to always scan entire disk if necessary
+  - fix a livelock when we cause a huge number of cache misses
+  - Add a cond_resched() call to gc
+  - clear BCACHE_DEV_UNLINK_DONE flag when attaching a backing device
+  - fix a leak in bch_cached_dev_run()
+  - unregister reboot notifier if bcache fails to unregister device
+  - allows use of register in udev to avoid "device_busy" error.
+  - prevent crash on changing writeback_running
+  - Change refill_dirty() to always scan entire disk if necessary
   * KEYS: Fix keyring ref leak in join_session_keyring() (CVE-2016-0728)
-
+  
   [ Salvatore Bonaccorso ]
   * unix: properly account for FDs passed over unix sockets (CVE-2013-4312)
-
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 19 Jan 2016 00:41:31 +0000
 
 linux (4.3.3-5~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
 
- -- Héctor Orón Martínez <zumbi at debian.org>  Thu, 07 Jan 2016 12:35:05 +0100
+-- Héctor Orón Martínez <zumbi at debian.org>  Thu, 07 Jan 2016 12:35:05 +0100
 
 linux (4.3.3-5) unstable; urgency=medium
 
   * [armhf] udeb: Fix duplication and circular dependency between core-modules
-    and usb-modules (really fixes FTBFS)
-    - Add core-modules as a dependency of usb-modules
-    - Remove gpio-viperboard from core-modules as it is unlikely to be needed
-
+  and usb-modules (really fixes FTBFS)
+  - Add core-modules as a dependency of usb-modules
+  - Remove gpio-viperboard from core-modules as it is unlikely to be needed
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 04 Jan 2016 00:45:27 +0000
 
 linux (4.3.3-4) unstable; urgency=medium
 
   * [armhf] udeb: Remove pbias-regulator module from mmc-modules as it's now
-    in core-modules (fixes FTBFS)
+  in core-modules (fixes FTBFS)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 03 Jan 2016 01:50:52 +0000
 
@@ -1568,43 +1567,35 @@ linux (4.3.3-3) unstable; urgency=medium
   * bluetooth: Validate socket address length in sco_sock_bind() (CVE-2015-8575)
   * [xen] Fix race conditions in back-end drivers (CVE-2015-8550, XSA-155)
   * [xen] pciback: Fix state validation in MSI control operations
-    (CVE-2015-8551, CVE-2015-8852, XSA-157)
+  (CVE-2015-8551, CVE-2015-8852, XSA-157)
   * ptrace: being capable wrt a process requires mapped uids/gids
-    (CVE-2015-8709)
+  (CVE-2015-8709)
   * KEYS: Fix race between read and revoke (CVE-2015-7550)
   * [armhf] udeb: Add modular clock, GPIO, PCIe PHY and regulator drivers to
-    core-modules (Closes: #809521)
+  core-modules (Closes: #809521)
   * [armhf] udeb: Add more USB PHY drivers to usb-modules
   * drm/nouveau/pmu: do not assume a PMU is present (Closes: #809481)
   * [x86] drm/i915: Don't compare has_drrs strictly in pipe config
-    (Closes: #808720)
+  (Closes: #808720)
   * [armhf] crypto: sun4i-ss - add missing statesize (Closes: #808625)
   * Revert "xhci: don't finish a TD if we get a short transfer event mid TD"
-    (Closes: #808602, #808953, regression in 4.3-rc7)
+  (Closes: #808602, #808953, regression in 4.3-rc7)
   * [x86] pinctrl: Enable PINCTRL_CHERRYVIEW (Closes: #808044)
   * [s390x] udeb: Add crc-modules package (Closes: #808051)
-
+  
   [ Salvatore Bonaccorso ]
   * ovl: fix permission checking for setattr (CVE-2015-8660)
   * [x86] kvm: Reload pit counters for all channels when restoring state
-    (CVE-2015-7513)
-
+  (CVE-2015-7513)
+  
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 Jan 2016 16:45:46 +0000
 
-<<<<<<< HEAD
-linux (4.3.3-2~bpo8+1) jessie-backports; urgency=medium
-
-  * Rebuild for jessie-backports.
-
- -- Héctor Orón Martínez <hector.oron at collabora.co.uk>  Wed, 23 Dec 2015 16:41:42 +0100
-=======
 linux-tools (4.3.1-2) unstable; urgency=medium
 
   * Upload for Perl 5.22 transition (Closes: #808329)
   * debian/rules: Fix check for binNMU, broken since 4.1.4-1
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 19 Dec 2015 03:47:10 +0000
->>>>>>> 26fa177d481630295220e5608296f1f006bf0392
 
 linux (4.3.3-2) unstable; urgency=medium
 
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 21edfc7..b614272 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-5
 featuresets:
  none
  rt
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 0a6341a..5c08a61 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -15,7 +15,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-arm
+headers%gcc-4.9: linux-compiler-gcc-4.9-arm
 
 [marvell_build]
 # Signature verification disabled to save on code size
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index d8b1fa9..8f7551f 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -15,7 +15,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-arm
+headers%gcc-4.9: linux-compiler-gcc-4.9-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
diff --git a/debian/config/defines b/debian/config/defines
index 0ed4943..735efdc 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -26,7 +26,7 @@ arches:
  sparc
  sparc64
  x32
-compiler: gcc-5
+compiler: gcc-4.9
 featuresets:
  none
  rt
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index 67351e6..d14fa07 100644
--- a/debian/config/hppa/defines
+++ b/debian/config/hppa/defines
@@ -24,5 +24,5 @@ hardware: multiprocessor 64-bit PA-RISC
 hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM
 
 [relations]
-gcc-5: gcc-5 <!stage1>, binutils-hppa64-linux-gnu <!stage1>, gcc-5-hppa64-linux-gnu <!stage1>
+gcc-4.9: gcc-4.9, binutils-hppa64, gcc-4.9-hppa64
 
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index bba098c..753fe0d 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-5
 featuresets:
  none
  rt
diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines
index dcaef97..1b34ac9 100644
--- a/debian/config/m68k/defines
+++ b/debian/config/m68k/defines
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-4.8
 cflags: -ffreestanding
 flavours:
  m68k
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 517ed75..30d86c9 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -13,7 +13,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-s390
+headers%gcc-4.9: linux-compiler-gcc-4.9-s390
 
 [s390x_build]
 debug-info: true
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index da7c2dc..d51fba3 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,19 +1,19 @@
-Package: linux-compiler-gcc-5-arm
+Package: linux-compiler-gcc-4.9-arm
 Build-Profiles: <!stage1>
-Depends: gcc-5, ${misc:Depends}
+Depends: gcc-4.9, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
 Description: Compiler for Linux on ARM (meta-package)
- This package depends on gcc 5 of the appropriate architecture for
+ This package depends on gcc 4.9 of the appropriate architecture for
  Linux on armel and armhf.
 
-Package: linux-compiler-gcc-5-s390
+Package: linux-compiler-gcc-4.9-s390
 Build-Profiles: <!stage1>
-Depends: gcc-5, ${misc:Depends}
+Depends: gcc-4.9, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
 Description: Compiler for Linux on IBM zSeries (meta-package)
- This package depends on gcc 5 of the appropriate architecture for
+ This package depends on gcc 4.9 of the appropriate architecture for
  Linux on s390 and s390x.
 
 Package: linux-compiler-gcc-4.9-x86

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



More information about the Kernel-svn-changes mailing list