Merge changes from sid up to 3.11.7-1

svn path=/dists/trunk/linux/; revision=20787

debian/bin/buildcheck.py

@@ -44,7 +44,13 @@ class CheckAbi(object):
 
         self.filename_new = "%s/Module.symvers" % dir
 
-        version_abi = self.config['version', ]['abiname']
+        upstream_version = self.config['version',]['upstream']
+        try:
+            version_abi = (upstream_version + '-' +
+                           self.config['abi', arch]['abiname'])
+        except KeyError:
+            version_abi = (upstream_version + '-' +
+                           self.config['abi', ]['abiname'])
         self.filename_ref = "debian/abi/%s/%s_%s_%s" % (version_abi, arch, featureset, flavour)
 
     def __call__(self, out):

debian/bin/gencontrol.py

@@ -469,7 +469,9 @@ class Gencontrol(Base):
             'source_package': self.changelog[0].source,
             'abiname': self.abiname,
         }
-        self.config['version', ] = {'source': self.version.complete, 'abiname': self.abiname}
+        self.config['version', ] = {'source': self.version.complete,
+                                    'upstream': self.version.linux_upstream,
+                                    'abiname': self.abiname}
 
         distribution = self.changelog[0].distribution
         if distribution in ('unstable', ):

debian/changelog

@@ -20,6 +20,21 @@ linux (3.12~rc7-1~exp1) experimental; urgency=low
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 28 Oct 2013 04:12:20 +0000
 
+linux (3.11.7-1) unstable; urgency=low
+  
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.11.7
+    - tcp: TSO packets automatic sizing
+    - tcp: TSQ can use a dynamic limit
+    - tcp: must unclone packets before mangling them
+    - tcp: fix incorrect ca_state in tail loss probe (Closes: #728726)
+
+  [ Ben Hutchings ]
+  * [armel] udeb: Re-enable iop32x flavour
+  * Bump ABI to 2 due to TCP changes
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 09 Nov 2013 20:18:02 +0000
+
 linux (3.11.6-2) unstable; urgency=medium
 
   [ Ben Hutchings ]

debian/installer/armel/kernel-versions

@@ -1,5 +1,5 @@
 # arch version flavour   installedname suffix build-depends
-#armel  -       iop32x    -             y      -
+armel  -       iop32x    -             y      -
 armel  -       kirkwood  -             y      -
 armel  -       orion5x   -             y      -
 armel  -       versatile -             y      -