Update to Linux 3.10.5

Bump ABI to 2, as there is a firewire ABI change that I can't see how to
work around.

svn path=/dists/sid/linux/; revision=20445

debian/changelog

@@ -1,4 +1,4 @@
-linux (3.10.4-1) UNRELEASED; urgency=low
+linux (3.10.5-1) UNRELEASED; urgency=low
 
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.10.4
@@ -26,12 +26,56 @@ linux (3.10.4-1) UNRELEASED; urgency=low
     - media: saa7134: Fix unlocked snd_pcm_stop() call
     - media: dmxdev: remove dvb_ringbuffer_flush() on writer side
     - lockd: protect nlm_blocked access in nlmsvc_retry_blocked
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.10.5
+    - mm: fix the TLB range flushed when __tlb_remove_page() runs out of slots
+    - iscsi-target: Fix tfc_tpg_nacl_auth_cit configfs length overflow
+    - iser-target: Fix session reset bug with RDMA_CM_EVENT_DISCONNECTED
+    - iscsi-target: Fix ISCSI_OP_SCSI_TMFUNC handling for iser
+    - firewire: fix libdc1394/FlyCap2 iso event regression
+    - SCSI: sd: fix crash when UA received on DIF enabled device
+    - tracing: Remove locking trace_types_lock from
+      tracing_reset_all_online_cpus()
+    - usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with
+      xhci 1.0
+    - xhci: fix null pointer dereference on ring_doorbell_for_active_rings
+    - xhci: Avoid NULL pointer deref when host dies.
+    - staging: comedi: fix a race between do_cmd_ioctl() and read/write
+    - Btrfs: fix wrong write offset when replacing a device
+    - Btrfs: fix lock leak when resuming snapshot deletion
+    - Btrfs: re-add root to dead root list if we stop dropping it
+    - xen-netfront: pull on receive skb may need to happen earlier
+    - md: Remove recent change which allows devices to skip recovery.
+    - md/raid1: fix bio handling problems in process_checks()
+    - md/raid5: fix interaction of 'replace' and 'recovery'.
+    - md/raid10: remove use-after-free bug.
+    - svcrdma: underflow issue in decode_write_list()
+    - nfsd: nfsd_open: when dentry_open returns an error do not propagate as
+      struct file
+    - ACPI / scan: Do not try to attach scan handlers to devices having them
+    - drm/radeon: fix endian issues with DP handling (v3)
+    - drm/radeon: fix combios tables on older cards
+    - drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a
+    - drm/i915: Fix write-read race with multiple rings
+    - Partially revert "drm/i915: unconditionally use mt forcewake on hsw/ivb"
+    - drm/i915: Fix incoherence with fence updates on Sandybridge+
+    - drm/i915: fix long-standing SNB regression in power consumption after resume v2
+    - drm/i915: Fix dereferencing invalid connectors in is_crtc_connector_off()
+    - drm/i915: correctly restore fences with objects attached
+    - drm/i915: Serialize almost all register access
+    - drm/radeon/atom: initialize more atom interpretor elements to 0
+    - mm: mempolicy: fix mbind_range() && vma_adjust() interaction
+    - tty_port: Fix refcounting leak in tty_port_tty_hangup()
+    - vfs: livelock avoidance in sget()
+    - iscsi-target: Fix iscsit_add_reject* usage for iser
+    - drm/i915: Correct obj->mm_list link to
+      dev_priv->dev_priv->mm.inactive_list
 
   [ Ben Hutchings ]
   * [sparc] cpufreq: Convince genksyms that the ABI didn't change
     (fixes FTBFS)
   * [hppa] udeb: Add core-modules package (Closes: #718270)
   * nl80211: fix another nl80211_fam.attrbuf race
+  * Bump ABI to 2
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 30 Jul 2013 18:09:20 +0200
 

debian/config/defines

@@ -1,8 +1,5 @@
 [abi]
-abiname: 1
-ignore-changes:
-# Probably not used OOT
- module:drivers/edac/*
+abiname: 2
 
 [base]
 arches:

debian/patches/bugfix/all/xen-blkback-Check-device-permissions-before-allowing.patch

@@ -1,52 +0,0 @@
-From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Date: Wed, 16 Jan 2013 11:33:52 -0500
-Subject: xen/blkback: Check device permissions before allowing OP_DISCARD
-Origin: https://git.kernel.org/cgit/linux/kernel/git/konrad/xen.git/commit?id=604c499cbbcc3d5fe5fb8d53306aa0fae1990109
-
-We need to make sure that the device is not RO or that
-the request is not past the number of sectors we want to
-issue the DISCARD operation for.
-
-This fixes CVE-2013-2140.
-
-Cc: stable@vger.kernel.org
-Acked-by: Jan Beulich <JBeulich@suse.com>
-Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
-[v1: Made it pr_warn instead of pr_debug]
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
----
- drivers/block/xen-blkback/blkback.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
-index e79ab45..4119bcd 100644
---- a/drivers/block/xen-blkback/blkback.c
-+++ b/drivers/block/xen-blkback/blkback.c
-@@ -876,7 +876,18 @@ static int dispatch_discard_io(struct xen_blkif *blkif,
- 	int status = BLKIF_RSP_OKAY;
- 	struct block_device *bdev = blkif->vbd.bdev;
- 	unsigned long secure;
-+	struct phys_req preq;
-+
-+	preq.sector_number = req->u.discard.sector_number;
-+	preq.nr_sects      = req->u.discard.nr_sectors;
- 
-+	err = xen_vbd_translate(&preq, blkif, WRITE);
-+	if (err) {
-+		pr_warn(DRV_PFX "access denied: DISCARD [%llu->%llu] on dev=%04x\n",
-+			preq.sector_number,
-+			preq.sector_number + preq.nr_sects, blkif->vbd.pdevice);
-+		goto fail_response;
-+	}
- 	blkif->st_ds_req++;
- 
- 	xen_blkif_get(blkif);
-@@ -887,7 +898,7 @@ static int dispatch_discard_io(struct xen_blkif *blkif,
- 	err = blkdev_issue_discard(bdev, req->u.discard.sector_number,
- 				   req->u.discard.nr_sectors,
- 				   GFP_KERNEL, secure);
--
-+fail_response:
- 	if (err == -EOPNOTSUPP) {
- 		pr_debug(DRV_PFX "discard op failed, not supported\n");
- 		status = BLKIF_RSP_EOPNOTSUPP;

debian/patches/series

@@ -103,7 +103,6 @@ bugfix/all/alx-fix-MAC-address-alignment-problem.patch
 bugfix/all/alx-fix-ethtool-support-code.patch
 bugfix/all/alx-remove-WoL-support.patch
 
-bugfix/all/xen-blkback-Check-device-permissions-before-allowing.patch
 features/all/iwlwifi-mvm-support-BSS-only.patch
 features/all/iwlwifi-mvm-adjust-firmware-D3-configuration-API.patch
 features/all/iwlwifi-bump-required-firmware-API-version-for-3160-.patch