Merge tag 'debian/4.1.6-1'

Conflicts:
	debian/changelog
	debian/config/defines
	debian/installer/mips/package-list
	debian/patches/bugfix/all/perf-fix-double-free-of-the-aux-buffer.patch
	debian/patches/series

4 files changed, 63 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index c33f33cdda7d..622428cb854f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,65 @@ linux (4.2~rc6-1~exp1) experimental; urgency=medium
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 12 Aug 2015 20:48:00 +0200
 
+linux (4.1.6-1) unstable; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6
+    - [mips*/*-malta] Don't reinitialise RTC (regression in 3.14)
+    - [mips*] Make set_pte() SMP safe.
+    - fsnotify: fix oops in fsnotify_clear_marks_by_group_flags()
+    - [x86] drm/i915: Declare the swizzling unknown for L-shaped configurations
+    - [x86] drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop
+    - drm/radeon: rework audio detect (v4) (regression in 4.0)
+    - drm/radeon/combios: add some validation of lvds values
+      (regression in 4.0)
+    - ipr: Fix incorrect trace indexing
+    - ipr: Fix invalid array indexing for HRRQ
+    - Bluetooth: Fix NULL pointer dereference in smp_conn_security
+    - [armhf] dmaengine: pl330: Fix overflow when reporting residue in memcpy
+      (regression in 4.0)
+    - [armhf] dmaengine: pl330: Really fix choppy sound because of wrong residue
+      calculation (regression in 4.0)
+    - xhci: fix off by one error in TRB DMA address boundary check
+    - ath10k: fix qca61x4 hw2.1 support
+    - [sparc*] Fix userspace FPU register corruptions. (Closes: #789180)
+    - ASoC: dapm: Lock during userspace access
+    - ASoC: dapm: Don't add prefix to widget stream name (regression in 4.1)
+    - [x86] xen: Probe target addresses in set_aliased_prot() before the
+      hypercall
+    - xen/gntdevt: Fix race condition in gntdev_release()
+    - hwrng: core - correct error check of kthread_run call
+    - [x86] crypto: qat - Fix invalid synchronization between
+      register/unregister sym algs
+    - rbd: fix copyup completion race
+    - [armhf] OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
+    - [x86] hwmon: (dell-smm) Blacklist Dell Studio XPS 8100
+    - ocfs2: fix BUG in ocfs2_downconvert_thread_do_work()
+    - ocfs2: fix shift left overflow
+    - nfsd: Drop BUG_ON and ignore SECLABEL on absent filesystem
+    - md/raid1: extend spinlock to protect raid1_end_read_request against
+      inconsistencies
+    - dm: fix dm_merge_bvec regression on 32 bit systems (regression in 3.19
+    - [x86] Input: alps - only Dell laptops have separate button bits for v2
+      dualpoint sticks (regression in 4.1)
+    - mm, vmscan: Do not wait for page writeback for GFP_NOFS allocations
+    - signalfd: fix information leak in signalfd_copyinfo
+    - signal: fix information leak in copy_siginfo_to_user
+    - signal: fix information leak in copy_siginfo_from_user32
+    - nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid
+
+  [ Aurelien Jarno ]
+  * [mips*] Build ext4 as module. Add core-modules and ext4-modules udeb.
+    Fixes FTBFS.
+
+  [ Ben Hutchings ]
+  * [i386] udeb: Make gpio_keys_polled and leds-gpio optional in input-modules
+    as they are not built for the 686-pae flavour (fixes FTBFS)
+  * perf: Fix AUX buffer refcounting
+  * ovl: Revert changes in 4.1.5-1 due to regression (Reopens: #786925)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 23 Aug 2015 12:19:22 +0200
+
 linux (4.1.5-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/installer/i386/modules/i386/input-modules b/debian/installer/i386/modules/i386/input-modules
index b12d1f5c7aaf..cdba2e4a79c6 100644
--- a/debian/installer/i386/modules/i386/input-modules
+++ b/debian/installer/i386/modules/i386/input-modules
@@ -1,4 +1,5 @@
 #include <input-modules>
 # Needed on some Geode LX boards - Alix2/3/6, Soekris net5501, Traverse GEOS
-gpio_keys_polled
-leds-gpio
+# so only built for 586 flavour
+gpio_keys_polled ?
+leds-gpio ?
diff --git a/debian/installer/mips/package-list b/debian/installer/mips/package-list
index 2dd86ee21bd3..193faf10e390 100644
--- a/debian/installer/mips/package-list
+++ b/debian/installer/mips/package-list
@@ -4,4 +4,4 @@
 # It overwrites specifications from /usr/share/kernel-wedge/package-list.
 #
 Package: kernel-image
-Provides: ata-modules, ext2-modules, ext3-modules, rtc-modules
+Provides: ata-modules, rtc-modules
diff --git a/debian/patches/series b/debian/patches/series
index baa5cf101153..67c516f4aa8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -81,7 +81,6 @@ bugfix/all/documentation-avoid-creating-man-pages-in-source-tree.patch
 features/all/efi-autoload-efi-pstore.patch
 features/all/regulator-axp20x-Add-module-alias.patch
 
-
 # Hardening from grsecurity
 features/all/grsecurity/grsecurity-kconfig.patch
 # Disabled until we add code into the grsecurity/ directory