Fri Jun 29 01:05:10 UTC 2012

Author: benh
Date: Fri Jun 29 01:05:07 2012
New Revision: 19228

Log:
Merge changes from sid branch of linux/linux-2.6 up to r19072

Added:
   dists/squeeze-backports/linux/   (props changed)
      - copied from r19227, dists/squeeze-backports/linux-2.6/
   dists/squeeze-backports/linux/debian/bin/patch.apply
      - copied unchanged from r19072, dists/sid/linux/debian/bin/patch.apply
   dists/squeeze-backports/linux/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/all/fix-scsi_wait_scan.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/fix-scsi_wait_scan.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch
   dists/squeeze-backports/linux/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
   dists/squeeze-backports/linux/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch
   dists/squeeze-backports/linux/debian/patches/features/all/AppArmor-compatibility-patch-for-v5-interface.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/features/all/AppArmor-compatibility-patch-for-v5-interface.patch
   dists/squeeze-backports/linux/debian/patches/features/all/be2net/
      - copied from r19064, dists/sid/linux-2.6/debian/patches/features/all/be2net/
   dists/squeeze-backports/linux/debian/patches/features/all/codel/
      - copied from r19064, dists/sid/linux-2.6/debian/patches/features/all/codel/
   dists/squeeze-backports/linux/debian/patches/features/all/flow_dissector-use-a-64bit-load-store.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/features/all/flow_dissector-use-a-64bit-load-store.patch
   dists/squeeze-backports/linux/debian/patches/features/all/net-flow_dissector.c-missing-include-linux-export.h.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/features/all/net-flow_dissector.c-missing-include-linux-export.h.patch
   dists/squeeze-backports/linux/debian/patches/features/all/net-introduce-skb_flow_dissect.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/features/all/net-introduce-skb_flow_dissect.patch
   dists/squeeze-backports/linux/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch
   dists/squeeze-backports/linux/debian/patches/features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch
   dists/squeeze-backports/linux/debian/patches/features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch
      - copied unchanged from r19064, dists/sid/linux-2.6/debian/patches/features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch
   dists/squeeze-backports/linux/debian/patches/series-all
      - copied unchanged from r19072, dists/sid/linux/debian/patches/series-all
   dists/squeeze-backports/linux/debian/patches/series-none
      - copied unchanged from r19072, dists/sid/linux/debian/patches/series-none
   dists/squeeze-backports/linux/debian/patches/series-orig
      - copied unchanged from r19072, dists/sid/linux/debian/patches/series-orig
   dists/squeeze-backports/linux/debian/patches/series-rt
      - copied unchanged from r19072, dists/sid/linux/debian/patches/series-rt
Deleted:
   dists/squeeze-backports/linux/debian/patches/bugfix/all/kvm-ensure-all-vcpus-are-consistent-with-in-kernel-irqchip.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/all/kvm-lock-slots_lock-around-device-assignment.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/all/kvm-mmu_notifier-flush-tlbs-before-releasing-mmu_lock.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/s390/kvm-s390-do-store-status-after-handling-stop_on_stop-bit.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/s390/kvm-s390-sanitize-fpc-registers-for-kvm_set_fpu.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/x86/kvm-nvmx-fix-erroneous-exception-bitmap-check.patch
   dists/squeeze-backports/linux/debian/patches/bugfix/x86/kvm-vmx-vmx_set_cr0-expects-kvm-srcu-locked.patch
   dists/squeeze-backports/linux/debian/patches/features/all/wacom/0004-Input-wacom-relax-Bamboo-stylus-ID-check.patch
   dists/squeeze-backports/linux/debian/patches/series/
   dists/squeeze-backports/linux/debian/templates/patch.apply.in
   dists/squeeze-backports/linux/debian/templates/patch.unpatch
Modified:
   dists/squeeze-backports/linux/debian/README.Debian
   dists/squeeze-backports/linux/debian/README.source
   dists/squeeze-backports/linux/debian/bin/   (props changed)
   dists/squeeze-backports/linux/debian/bin/gencontrol.py
   dists/squeeze-backports/linux/debian/bin/genorig.py
   dists/squeeze-backports/linux/debian/changelog
   dists/squeeze-backports/linux/debian/config/alpha/config
   dists/squeeze-backports/linux/debian/config/armel/config.versatile
   dists/squeeze-backports/linux/debian/config/armhf/config.omap
   dists/squeeze-backports/linux/debian/config/config
   dists/squeeze-backports/linux/debian/config/hppa/config
   dists/squeeze-backports/linux/debian/config/ia64/config
   dists/squeeze-backports/linux/debian/config/kernelarch-x86/config
   dists/squeeze-backports/linux/debian/config/kernelarch-x86/config-arch-32
   dists/squeeze-backports/linux/debian/config/kernelarch-x86/config-arch-64
   dists/squeeze-backports/linux/debian/config/mips/config.4kc-malta
   dists/squeeze-backports/linux/debian/config/mips/config.5kc-malta
   dists/squeeze-backports/linux/debian/config/mips/config.r5k-ip32
   dists/squeeze-backports/linux/debian/config/mips/config.sb1-bcm91250a
   dists/squeeze-backports/linux/debian/config/mips/config.sb1a-bcm91480b
   dists/squeeze-backports/linux/debian/config/mipsel/defines
   dists/squeeze-backports/linux/debian/config/powerpc/config
   dists/squeeze-backports/linux/debian/config/powerpc/config.powerpc64
   dists/squeeze-backports/linux/debian/config/sparc/config
   dists/squeeze-backports/linux/debian/installer/package-list
   dists/squeeze-backports/linux/debian/lib/python/debian_linux/debian.py
   dists/squeeze-backports/linux/debian/lib/python/debian_linux/gencontrol.py
   dists/squeeze-backports/linux/debian/lib/python/debian_linux/patches.py
   dists/squeeze-backports/linux/debian/patches/debian/dfsg/files-1
   dists/squeeze-backports/linux/debian/po/ca.po
   dists/squeeze-backports/linux/debian/po/cs.po
   dists/squeeze-backports/linux/debian/po/da.po
   dists/squeeze-backports/linux/debian/po/de.po
   dists/squeeze-backports/linux/debian/po/es.po
   dists/squeeze-backports/linux/debian/po/et.po
   dists/squeeze-backports/linux/debian/po/fr.po
   dists/squeeze-backports/linux/debian/po/it.po
   dists/squeeze-backports/linux/debian/po/ja.po
   dists/squeeze-backports/linux/debian/po/nl.po
   dists/squeeze-backports/linux/debian/po/pl.po
   dists/squeeze-backports/linux/debian/po/pt.po
   dists/squeeze-backports/linux/debian/po/pt_BR.po
   dists/squeeze-backports/linux/debian/po/ru.po
   dists/squeeze-backports/linux/debian/po/sk.po
   dists/squeeze-backports/linux/debian/po/sv.po
   dists/squeeze-backports/linux/debian/po/templates.pot
   dists/squeeze-backports/linux/debian/po/tr.po
   dists/squeeze-backports/linux/debian/po/vi.po
   dists/squeeze-backports/linux/debian/rules
   dists/squeeze-backports/linux/debian/rules.real
   dists/squeeze-backports/linux/debian/templates/control.main.in
   dists/squeeze-backports/linux/debian/templates/control.source.in
   dists/squeeze-backports/linux/debian/templates/image.plain.bug/control

Modified: dists/squeeze-backports/linux/debian/README.Debian
==============================================================================

--- dists/squeeze-backports/linux-2.6/debian/README.Debian	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/README.Debian	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,17 +1,17 @@
-linux-2.6 for DEBIAN
-------------------------
+Linux kernel for Debian
+-----------------------
 
 Patches
 -------
 Debian applies small changes to the kernel source. These are split up into
 separated patches addressing individual problems. Each of the patch files
 contains a description and mentions the author. The patches can be found
-at http://svn.debian.org/wsvn/kernel/dists/trunk/linux-2.6/debian/patches/.
+at http://svn.debian.org/wsvn/kernel/dists/trunk/linux/debian/patches/.
 
 Config Files
 ------------
 The .config files used to build the various linux-image files are dynamically
-generated during the linux-2.6 package build.  See the source package for
+generated during the linux package build.  See the source package for
 details.  Each linux-image-* package provides the complete .config file that
 was used to generate it.  This file is installed in /boot.
 

Modified: dists/squeeze-backports/linux/debian/README.source
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/README.source	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/README.source	Fri Jun 29 01:05:07 2012	(r19228)
@@ -3,18 +3,18 @@
 
 1) You can use either:
    a) a git repository of the kernel source
-   b) a kernel tarball from kernel.org (e.g. linux-2.6.25.tar.bz2)
-      and, optionally, a patch (e.g. patch-2.6.26-rc3.bz2).
+   b) a kernel tarball from kernel.org (e.g. linux-3.4.tar.bz2)
+      and, optionally, a patch (e.g. patch-3.5-rc1.bz2).
 
 2) Run ./debian/bin/genorig.py <repository>
    or  ./debian/bin/genorig.py <tarball> [patch]
-   This will produce ../orig/linux-2.6_<version>.orig.tar.gz
-   (e.g. linux-2.6_2.6.26~rc3.orig.tar.gz).
+   This will produce ../orig/linux_<version>.orig.tar.gz
+   (e.g. linux_3.5~rc1.orig.tar.gz).
 
    (genorig.py requires the python and unifdef packages to be
     installed)
 
-3) Unpack linux-2.6-<version>.orig.tar.gz, cd into the new directory,
+3) Unpack linux_<version>.orig.tar.gz, cd into the new directory,
    and do a 'svn export' to get the debian/ subdirectory.
    Alternatively unpack using "make -f debian/rules orig".
 
@@ -27,16 +27,13 @@
 
 Patches are stored below debian/patches, loosely sorted in bugfix/,
 features/ and debian/. Patches are in the standard kernel patch
-format.
+format (unified diff to be applied with patch -p1) and generally have
+DEP-3 headers.
 
 The order and the selection of patches which are applied during build
-time are specified in the series/ subdirectory. For each revision
-there may be up to one file named REVISION specifying the patches
-applied for the standard revision and one file named REVISION-extra
-for addon flavours. If, e.g. the patches are specified for 2.6.26-12, 
-the patch order file is called debian/patches/series/12 for the
-standard kernel images and debian/patches/series/12-extra for the
-addon flavours.
+time are specified in the series/ subdirectory. The series file 'base'
+is used for all configurations and the series file 'base-extra' is
+additionally used for optional featuresets.
 
 Let's look at the actual series file for 2.6.26-12:
 
@@ -46,11 +43,9 @@
 + bugfix/all/ata-pata_marvell-vs-ahci.patch
 + features/sparc/video-sunxvr500-intergraph.patch
 
-The patches to be applied are specified relative to debian/patches.
-"+" indicates that the patch should be added, "-" can be used to
-drop a patch in later patch series (e.g. if the patch turned out to
-be faulty). The series files may be arbitrarily documented with 
-comments starting with "#".
+The patches to be applied are specified relative to debian/patches
+and must be preceded by a "+". The series files may be arbitrarily
+documented with comments starting with "#".
 
 Let's now have a look at the series file for the addon kernel flavours
 of 2.6.26-12:

Modified: dists/squeeze-backports/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/bin/gencontrol.py	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/bin/gencontrol.py	Fri Jun 29 01:05:07 2012	(r19228)
@@ -63,6 +63,20 @@
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages.extend(self.process_packages(self.templates["control.main"], self.vars))
 
+    def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
+        # Add featureset source rules
+        for featureset in iter(self.config['base', ]['featuresets']):
+            makeflags_featureset = makeflags.copy()
+            makeflags_featureset['FEATURESET'] = featureset
+            cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
+                           % makeflags_featureset]
+            makefile.add('source_%s_real' % featureset, cmds=cmds_source)
+            makefile.add('source_%s' % featureset,
+                         ['source_%s_real' % featureset])
+            makefile.add('source', ['source_%s' % featureset])
+
+        super(Gencontrol, self).do_main_recurse(packages, makefile, vars, makeflags, extra)
+
     arch_makeflags = (
         ('kernel-arch', 'KERNEL_ARCH', False),
     )
@@ -91,13 +105,11 @@
         self.merge_packages(packages, packages_headers_arch, arch)
 
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags]
-        cmds_source = ["$(MAKE) -f debian/rules.real source-arch %s" % makeflags]
         makefile.add('binary-arch_%s_real' % arch, cmds=cmds_binary_arch)
-        makefile.add('source_%s_real' % arch, cmds=cmds_source)
 
         # Shortcut to aid architecture bootstrapping
         makefile.add('binary-libc-dev_%s' % arch,
-                     ['source_%s_real' % arch],
+                     ['source_none_real'],
                      ["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
                       (arch, makeflags)])
 
@@ -141,9 +153,7 @@
         self.merge_packages(packages, (package_headers,), arch)
 
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-featureset %s" % makeflags]
-        cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s" % makeflags]
         makefile.add('binary-arch_%s_%s_real' % (arch, featureset), cmds=cmds_binary_arch)
-        makefile.add('source_%s_%s_real' % (arch, featureset), cmds=cmds_source)
 
     flavour_makeflags_base = (
         ('compiler', 'COMPILER', False),
@@ -333,20 +343,6 @@
         makefile.add('build_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build)
         makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_setup)
 
-    def do_extra(self, packages, makefile):
-        apply = self.templates['patch.apply']
-
-        vars = {
-            'revisions': 'orig base ' + ' '.join([i.revision for i in self.versions[::-1]]),
-            'upstream': self.version.upstream,
-            'linux_upstream': self.version.linux_upstream,
-            'abiname': self.abiname,
-        }
-
-        apply = self.substitute(apply, vars)
-
-        file('debian/bin/patch.apply', 'w').write(apply)
-
     def merge_packages(self, packages, new, arch):
         for new_package in new:
             name = new_package['Package']

Modified: dists/squeeze-backports/linux/debian/bin/genorig.py
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/bin/genorig.py	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/bin/genorig.py	Fri Jun 29 01:05:07 2012	(r19228)
@@ -34,8 +34,7 @@
 
         self.orig = '%s-%s' % (source, version.upstream)
         self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream)
-        self.tag = 'v' + re.sub(r"^(\d+\.\d+)\.0", r"\1",
-                                version.upstream.replace('~', '-'))
+        self.tag = 'v' + version.linux_upstream_full
 
     def __call__(self):
         import tempfile
@@ -100,9 +99,9 @@
             raise RuntimeError("Can't patch source")
 
     def debian_patch(self):
-        name = "orig-" + self.version_dfsg
+        name = "orig"
         self.log("Patching source with debian patch (series %s)\n" % name)
-        fp = file("debian/patches/series/" + name)
+        fp = file("debian/patches/series-" + name)
         series = PatchSeries(name, "debian/patches", fp)
         series(dir=os.path.join(self.dir, self.orig))
 

Copied: dists/squeeze-backports/linux/debian/bin/patch.apply (from r19072, dists/sid/linux/debian/bin/patch.apply)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/bin/patch.apply	Fri Jun 29 01:05:07 2012	(r19228, copy of r19072, dists/sid/linux/debian/bin/patch.apply)
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+import os, os.path, re, sys
+from warnings import warn
+from debian_linux.patches import PatchSeries
+
+def main():
+    options, args = parse_options()
+
+    if len(args) > 1:
+        print "Too much arguments"
+        return
+
+    home = options.home
+    name = options.featureset or "all"
+    fp = file(os.path.join(home, "series-%s" % name))
+    PatchSeries(name, home, fp)()
+
+def parse_options():
+    from optparse import OptionParser
+    parser = OptionParser(
+        usage = "%prog [OPTION]... [TARGET]",
+    )
+    parser.add_option(
+        '-f', '--featureset',
+        dest = 'featureset',
+        help = "featureset",
+    )
+    parser.add_option(
+        '-H', '--overwrite-home',
+        dest = 'home',
+        help = "overwrite home [no default]",
+    )
+
+    options, args = parser.parse_args()
+
+    return options, args
+
+if __name__ == '__main__':
+    def showwarning(message, category, filename, lineno,
+                    file=sys.stderr, line=''):
+        file.write("Warning: %s\n" % message)
+    import warnings
+    warnings.showwarning = showwarning
+    try:
+        main()
+    except RuntimeError, e:
+        sys.stderr.write("Error: %s\n" % e)
+        raise SystemExit, 1
+

Modified: dists/squeeze-backports/linux/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/changelog	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/changelog	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,3 +1,60 @@
+linux (3.2.19-2) UNRELEASED; urgency=low
+
+  * The "Not Quite So Many Different Version Numbers" release
+
+  [ Ben Hutchings ]
+  * Rename source package to 'linux' (Closes: #636010)
+  * linux-image: Change package name for bugs to 'src:linux' (Closes: #644198)
+  * DFSG: video: Remove nvidiafb and rivafb, which include apparently
+    obfuscated code (Closes: #383481).  The nouveau driver supports all
+    the same hardware, aside from RIVA 128 (NV3).
+  * udeb: Add udf-modules containing UDF filesystem module (Closes: #613972)
+  * [mipsel/loongson2f] linux-image: Recommend libc6-loongson2f
+    (Closes: #629410)
+  * Build-Depend on kmod or module-init-tools, not just the latter
+  * README.source: Update description of patch system to match current usage
+  * linux-patch-debian: Remove; it is no longer necessary for GPL compliance
+    and does not work with our current patch management
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 Jun 2012 20:31:53 +0100
+
+linux-2.6 (3.2.19-1) unstable; urgency=low
+
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.19
+    - hpsa: Fix problem with MSA2xxx devices (Closes: #661057)
+    - IB/core: Fix mismatch between locked and pinned pages
+    - iommu: Fix off by one in dmar_get_fault_reason()
+    - vfs: make AIO use the proper rw_verify_area() area helpers
+    - HID: logitech: read all 32 bits of report type bitfield (Closes: #671292)
+    - USB: Remove races in devio.c
+    - ext{3,4}: Fix error handling on inode bitmap corruption
+    - uvcvideo: Fix ENUMINPUT handling
+    - dl2k: Clean up rio_ioctl (CVE-2012-2313)
+    - [x86] MCE: Fix vm86 handling for 32bit mce handler
+    - [x86] mce: Fix check for processor context when machine check was taken.
+    - ethtool: Null-terminate filename passed to ethtool_ops::flash_device
+    - NFSv4: Fix buffer overflows in ACL support (CVE-2012-2375)
+      + Avoid reading past buffer when calling GETACL
+      + Avoid beyond bounds copy while caching ACL
+
+  [ Ben Hutchings ]
+  * be2net: Backport most changes up to Linux 3.5-rc1, thanks to
+    Sarveshwar Bandi (Closes: #673391)
+    - Add support for Skyhawk cards
+  * net/sched: Add codel and fq_codel from Linux 3.5-rc1
+  * [x86] udeb: Add hyperv-modules containing Hyper-V paravirtualised drivers
+  * [x86] ata_piix: defer disks to the Hyper-V drivers by default
+  * [x86] drm/i915:: Disable FBC on SandyBridge (Closes: #675022)
+  * AppArmor: compatibility patch for v5 interface (Closes: #661151)
+  * hugepages: fix use after free bug in "quota" handling (CVE-2012-2133)
+  * [x86] mm: pmd_read_atomic: fix 32bit PAE pmd walk vs pmd_populate SMP race
+    condition (CVE-2012-2373)
+  * hugetlb: fix resv_map leak in error path (CVE-2012-2390)
+  * [SCSI] fix scsi_wait_scan (Closes: #647436)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 01 Jun 2012 13:15:48 +0100
+
 linux-2.6 (3.2.18-1~bpo60+2) UNRELEASED; urgency=low
 
   * [armel] Disable CRYPTO_FIPS, VGA_ARB, FTRACE on iop32x and ixp4xx to

Modified: dists/squeeze-backports/linux/debian/config/alpha/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/alpha/config	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/alpha/config	Fri Jun 29 01:05:07 2012	(r19228)
@@ -964,11 +964,6 @@
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_TGA=m
 CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-# CONFIG_FB_NVIDIA_I2C is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_RIVA_I2C is not set
-# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/squeeze-backports/linux/debian/config/armel/config.versatile
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/armel/config.versatile	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/armel/config.versatile	Fri Jun 29 01:05:07 2012	(r19228)
@@ -409,8 +409,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
@@ -439,7 +437,6 @@
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y

Modified: dists/squeeze-backports/linux/debian/config/armhf/config.omap
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/armhf/config.omap	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/armhf/config.omap	Fri Jun 29 01:05:07 2012	(r19228)
@@ -275,7 +275,6 @@
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 
 ##
 ## file: drivers/video/omap/Kconfig

Modified: dists/squeeze-backports/linux/debian/config/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/config	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/config	Fri Jun 29 01:05:07 2012	(r19228)
@@ -3153,7 +3153,6 @@
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_ARC=m
 # CONFIG_FB_UVESA is not set
-# CONFIG_FB_NVIDIA_DEBUG is not set
 # CONFIG_FB_INTEL_DEBUG is not set
 # CONFIG_FB_INTEL_I2C is not set
 CONFIG_FB_S3=m
@@ -4554,6 +4553,8 @@
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_TCINDEX=m
@@ -4678,6 +4679,7 @@
 ##
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_APPARMOR_COMPAT_24=y
 
 ##
 ## file: security/integrity/ima/Kconfig

Modified: dists/squeeze-backports/linux/debian/config/hppa/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/hppa/config	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/hppa/config	Fri Jun 29 01:05:07 2012	(r19228)
@@ -593,8 +593,6 @@
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_STI=y
 # CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set

Modified: dists/squeeze-backports/linux/debian/config/ia64/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/ia64/config	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/ia64/config	Fri Jun 29 01:05:07 2012	(r19228)
@@ -719,11 +719,6 @@
 CONFIG_FB_ASILIANT=y
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_RIVA_I2C is not set
-# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/squeeze-backports/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/kernelarch-x86/config	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/kernelarch-x86/config	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1458,11 +1458,6 @@
 CONFIG_FB_N411=m
 CONFIG_FB_HGA=m
 CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_RIVA_I2C is not set
-# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_LE80578=m
 CONFIG_FB_CARILLO_RANCH=m
 # CONFIG_FB_INTEL is not set

Modified: dists/squeeze-backports/linux/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/kernelarch-x86/config-arch-32	Fri Jun 29 01:05:07 2012	(r19228)
@@ -464,7 +464,6 @@
 ##
 ## file: drivers/video/Kconfig
 ##
-CONFIG_FB_NVIDIA_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_I810_GTF is not set
 CONFIG_FB_MATROX_G=y

Modified: dists/squeeze-backports/linux/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/kernelarch-x86/config-arch-64	Fri Jun 29 01:05:07 2012	(r19228)
@@ -96,7 +96,6 @@
 ##
 ## file: drivers/video/Kconfig
 ##
-# CONFIG_FB_NVIDIA_I2C is not set
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_MAVEN=m
 # CONFIG_FB_ATY_GENERIC_LCD is not set

Modified: dists/squeeze-backports/linux/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.4kc-malta	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/mips/config.4kc-malta	Fri Jun 29 01:05:07 2012	(r19228)
@@ -998,11 +998,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-# CONFIG_FB_NVIDIA_I2C is not set
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-# CONFIG_FB_RIVA is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/squeeze-backports/linux/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.5kc-malta	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/mips/config.5kc-malta	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1002,11 +1002,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-# CONFIG_FB_NVIDIA_I2C is not set
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-# CONFIG_FB_RIVA is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/squeeze-backports/linux/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.r5k-ip32	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/mips/config.r5k-ip32	Fri Jun 29 01:05:07 2012	(r19228)
@@ -556,8 +556,6 @@
 CONFIG_FB_GBE=y
 CONFIG_FB_GBE_MEM=4
 # CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set

Modified: dists/squeeze-backports/linux/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/mips/config.sb1-bcm91250a	Fri Jun 29 01:05:07 2012	(r19228)
@@ -696,11 +696,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
-# CONFIG_FB_NVIDIA_I2C is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_I2C is not set
-# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/squeeze-backports/linux/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/mips/config.sb1a-bcm91480b	Fri Jun 29 01:05:07 2012	(r19228)
@@ -702,11 +702,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
-# CONFIG_FB_NVIDIA_I2C is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_I2C is not set
-# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/squeeze-backports/linux/debian/config/mipsel/defines
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mipsel/defines	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/mipsel/defines	Fri Jun 29 01:05:07 2012	(r19228)
@@ -49,3 +49,6 @@
 [loongson-2f_description]
 hardware: Loongson 2F
 hardware-long: Lemote Loongson 2F systems
+
+[loongson-2f_image]
+recommends: libc6-loongson2f

Modified: dists/squeeze-backports/linux/debian/config/powerpc/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/powerpc/config	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/powerpc/config	Fri Jun 29 01:05:07 2012	(r19228)
@@ -820,11 +820,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=y
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_RIVA_I2C is not set
-# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/squeeze-backports/linux/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/powerpc/config.powerpc64	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/powerpc/config.powerpc64	Fri Jun 29 01:05:07 2012	(r19228)
@@ -185,7 +185,6 @@
 # CONFIG_FB_PLATINUM is not set
 # CONFIG_FB_VALKYRIE is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_ATY128 is not set
 CONFIG_FB_PS3=y
 CONFIG_FB_PS3_DEFAULT_SIZE_M=9

Modified: dists/squeeze-backports/linux/debian/config/sparc/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/sparc/config	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/config/sparc/config	Fri Jun 29 01:05:07 2012	(r19228)
@@ -504,8 +504,6 @@
 CONFIG_FB_XVR2500=y
 CONFIG_FB_XVR1000=y
 # CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
 # CONFIG_FB_MATROX is not set
 CONFIG_FB_RADEON=y
 # CONFIG_FB_RADEON_I2C is not set

Modified: dists/squeeze-backports/linux/debian/installer/package-list
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/installer/package-list	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/installer/package-list	Fri Jun 29 01:05:07 2012	(r19228)
@@ -478,3 +478,15 @@
 Priority: extra
 Description: LED modules
  This package contains LED modules.
+
+Package: hyperv-modules
+Depends: kernel-image, input-modules, scsi-core-modules
+Priority: extra
+Description: Hyper-V modules
+ This package contains Hyper-V paravirtualised drivers for the kernel.
+
+Package: udf-modules
+Depends: kernel-image, crc-modules
+Priority: extra
+Description: UDF modules
+ This package contains the UDF filesystem module.

Modified: dists/squeeze-backports/linux/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/lib/python/debian_linux/debian.py	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/lib/python/debian_linux/debian.py	Fri Jun 29 01:05:07 2012	(r19228)
@@ -110,7 +110,7 @@
 (?P<version>
     \d+\.\d+
 )
-(?:
+(?P<update>
     \.\d+
 )?
 (?:
@@ -150,9 +150,11 @@
         self.linux_modifier = d['modifier']
         self.linux_version = d['version']
         if d['modifier'] is not None:
+            assert not d['update']
             self.linux_upstream = u'-'.join((d['version'], d['modifier']))
         else:
             self.linux_upstream = d['version']
+        self.linux_upstream_full = d['version'] + (d['update'] or u'')
         self.linux_dfsg = d['dfsg']
         self.linux_revision_experimental = match.group('revision_experimental') and True
         self.linux_revision_other = match.group('revision_other') and True

Modified: dists/squeeze-backports/linux/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/lib/python/debian_linux/gencontrol.py	Fri Jun 29 01:05:07 2012	(r19228)
@@ -77,7 +77,7 @@
 
 
 class Gencontrol(object):
-    makefile_targets = ('binary-arch', 'build', 'setup', 'source')
+    makefile_targets = ('binary-arch', 'build', 'setup')
 
     def __init__(self, config, templates, version=Version):
         self.config, self.templates = config, templates

Modified: dists/squeeze-backports/linux/debian/lib/python/debian_linux/patches.py
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/lib/python/debian_linux/patches.py	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/lib/python/debian_linux/patches.py	Fri Jun 29 01:05:07 2012	(r19228)
@@ -188,32 +188,3 @@
 
     def __repr__(self):
         return '<%s object for %s>' % (self.__class__.__name__, self.name)
-
-
-class PatchSeriesList(list):
-    def __call__(self, cond=bool, reverse=False):
-        if not reverse:
-            l = self
-        else:
-            l = self[::-1]
-        for i in l:
-            if reverse:
-                print "--> Try to unapply %s." % i.name
-            else:
-                print "--> Try to apply %s." % i.name
-            i(cond=cond, reverse=reverse)
-            if reverse:
-                print "--> %s fully unapplied." % i.name
-            else:
-                print "--> %s fully applied." % i.name
-
-    @classmethod
-    def read(cls, home, files):
-        ret = cls()
-        for i in files:
-            try:
-                fp = file(os.path.join(home, 'series', i))
-                ret.append(PatchSeries(i, home, fp))
-            except IOError:
-                pass
-        return ret

Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch (from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch)
@@ -0,0 +1,32 @@
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Tue, 8 Nov 2011 23:17:34 +0000
+Subject: [PATCH] drm/i915:: Disable FBC on SandyBridge
+
+commit d56d8b28e9247e7e35e02fbb12b12239a2c33ad1 upstream.
+
+Enabling FBC is causing the BLT ring to run between 10-100x slower than
+normal and frequently lockup. The interim solution is disable FBC once
+more until we know why.
+
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+---
+ drivers/gpu/drm/i915/intel_display.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index b3b51c4..19f35ec 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -1872,7 +1872,7 @@ static void intel_update_fbc(struct drm_device *dev)
+ 	if (enable_fbc < 0) {
+ 		DRM_DEBUG_KMS("fbc set to per-chip default\n");
+ 		enable_fbc = 1;
+-		if (INTEL_INFO(dev)->gen <= 5)
++		if (INTEL_INFO(dev)->gen <= 6)
+ 			enable_fbc = 0;
+ 	}
+ 	if (!enable_fbc) {
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/fix-scsi_wait_scan.patch (from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/fix-scsi_wait_scan.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/fix-scsi_wait_scan.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/fix-scsi_wait_scan.patch)
@@ -0,0 +1,40 @@
+From: James Bottomley <jbottomley at parallels.com>
+Date: Wed, 30 May 2012 09:45:39 +0000
+Subject: [SCSI] fix scsi_wait_scan
+
+commit 1ff2f40305772b159a91c19590ee159d3a504afc upstream.
+
+Commit  c751085943362143f84346d274e0011419c84202
+Author: Rafael J. Wysocki <rjw at sisk.pl>
+Date:   Sun Apr 12 20:06:56 2009 +0200
+
+    PM/Hibernate: Wait for SCSI devices scan to complete during resume
+
+Broke the scsi_wait_scan module in 2.6.30.  Apparently debian still uses it so
+fix it and backport to stable before removing it in 3.6.
+
+The breakage is caused because the function template in
+include/scsi/scsi_scan.h is defined to be a nop unless SCSI is built in.
+That means that in the modular case (which is every distro), the
+scsi_wait_scan module does a simple async_synchronize_full() instead of
+waiting for scans.
+
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/scsi/scsi_wait_scan.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/scsi_wait_scan.c b/drivers/scsi/scsi_wait_scan.c
+index 74708fc..ae78148 100644
+--- a/drivers/scsi/scsi_wait_scan.c
++++ b/drivers/scsi/scsi_wait_scan.c
+@@ -12,7 +12,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/device.h>
+-#include <scsi/scsi_scan.h>
++#include "scsi_priv.h"
+ 
+ static int __init wait_scan_init(void)
+ {

Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch (from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch)
@@ -0,0 +1,451 @@
+From: David Gibson <david at gibson.dropbear.id.au>
+Date: Wed, 21 Mar 2012 16:34:12 -0700
+Subject: [PATCH] hugepages: fix use after free bug in "quota" handling
+
+commit 90481622d75715bfcb68501280a917dbfe516029 upstream.
+
+hugetlbfs_{get,put}_quota() are badly named.  They don't interact with the
+general quota handling code, and they don't much resemble its behaviour.
+Rather than being about maintaining limits on on-disk block usage by
+particular users, they are instead about maintaining limits on in-memory
+page usage (including anonymous MAP_PRIVATE copied-on-write pages)
+associated with a particular hugetlbfs filesystem instance.
+
+Worse, they work by having callbacks to the hugetlbfs filesystem code from
+the low-level page handling code, in particular from free_huge_page().
+This is a layering violation of itself, but more importantly, if the
+kernel does a get_user_pages() on hugepages (which can happen from KVM
+amongst others), then the free_huge_page() can be delayed until after the
+associated inode has already been freed.  If an unmount occurs at the
+wrong time, even the hugetlbfs superblock where the "quota" limits are
+stored may have been freed.
+
+Andrew Barry proposed a patch to fix this by having hugepages, instead of
+storing a pointer to their address_space and reaching the superblock from
+there, had the hugepages store pointers directly to the superblock,
+bumping the reference count as appropriate to avoid it being freed.
+Andrew Morton rejected that version, however, on the grounds that it made
+the existing layering violation worse.
+
+This is a reworked version of Andrew's patch, which removes the extra, and
+some of the existing, layering violation.  It works by introducing the
+concept of a hugepage "subpool" at the lower hugepage mm layer - that is a
+finite logical pool of hugepages to allocate from.  hugetlbfs now creates
+a subpool for each filesystem instance with a page limit set, and a
+pointer to the subpool gets added to each allocated hugepage, instead of
+the address_space pointer used now.  The subpool has its own lifetime and
+is only freed once all pages in it _and_ all other references to it (i.e.
+superblocks) are gone.
+
+subpools are optional - a NULL subpool pointer is taken by the code to
+mean that no subpool limits are in effect.
+
+Previous discussion of this bug found in:  "Fix refcounting in hugetlbfs
+quota handling.". See:  https://lkml.org/lkml/2011/8/11/28 or
+http://marc.info/?l=linux-mm&m=126928970510627&w=1
+
+v2: Fixed a bug spotted by Hillf Danton, and removed the extra parameter to
+alloc_huge_page() - since it already takes the vma, it is not necessary.
+
+Signed-off-by: Andrew Barry <abarry at cray.com>
+Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
+Cc: Hugh Dickins <hughd at google.com>
+Cc: Mel Gorman <mgorman at suse.de>
+Cc: Minchan Kim <minchan.kim at gmail.com>
+Cc: Hillf Danton <dhillf at gmail.com>
+Cc: Paul Mackerras <paulus at samba.org>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+[bwh: Backported to 3.2: adjust context to apply after commit
+ c50ac050811d6485616a193eb0f37bfbd191cc89 'hugetlb: fix resv_map leak in
+ error path' which should be in 3.2.20]
+---
+--- a/fs/hugetlbfs/inode.c
++++ b/fs/hugetlbfs/inode.c
+@@ -626,9 +626,15 @@ static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+ 		spin_lock(&sbinfo->stat_lock);
+ 		/* If no limits set, just report 0 for max/free/used
+ 		 * blocks, like simple_statfs() */
+-		if (sbinfo->max_blocks >= 0) {
+-			buf->f_blocks = sbinfo->max_blocks;
+-			buf->f_bavail = buf->f_bfree = sbinfo->free_blocks;
++		if (sbinfo->spool) {
++			long free_pages;
++
++			spin_lock(&sbinfo->spool->lock);
++			buf->f_blocks = sbinfo->spool->max_hpages;
++			free_pages = sbinfo->spool->max_hpages
++				- sbinfo->spool->used_hpages;
++			buf->f_bavail = buf->f_bfree = free_pages;
++			spin_unlock(&sbinfo->spool->lock);
+ 			buf->f_files = sbinfo->max_inodes;
+ 			buf->f_ffree = sbinfo->free_inodes;
+ 		}
+@@ -644,6 +650,10 @@ static void hugetlbfs_put_super(struct super_block *sb)
+ 
+ 	if (sbi) {
+ 		sb->s_fs_info = NULL;
++
++		if (sbi->spool)
++			hugepage_put_subpool(sbi->spool);
++
+ 		kfree(sbi);
+ 	}
+ }
+@@ -874,10 +884,14 @@ hugetlbfs_fill_super(struct super_block *sb, void *data, int silent)
+ 	sb->s_fs_info = sbinfo;
+ 	sbinfo->hstate = config.hstate;
+ 	spin_lock_init(&sbinfo->stat_lock);
+-	sbinfo->max_blocks = config.nr_blocks;
+-	sbinfo->free_blocks = config.nr_blocks;
+ 	sbinfo->max_inodes = config.nr_inodes;
+ 	sbinfo->free_inodes = config.nr_inodes;
++	sbinfo->spool = NULL;
++	if (config.nr_blocks != -1) {
++		sbinfo->spool = hugepage_new_subpool(config.nr_blocks);
++		if (!sbinfo->spool)
++			goto out_free;
++	}
+ 	sb->s_maxbytes = MAX_LFS_FILESIZE;
+ 	sb->s_blocksize = huge_page_size(config.hstate);
+ 	sb->s_blocksize_bits = huge_page_shift(config.hstate);
+@@ -896,38 +910,12 @@ hugetlbfs_fill_super(struct super_block *sb, void *data, int silent)
+ 	sb->s_root = root;
+ 	return 0;
+ out_free:
++	if (sbinfo->spool)
++		kfree(sbinfo->spool);
+ 	kfree(sbinfo);
+ 	return -ENOMEM;
+ }
+ 
+-int hugetlb_get_quota(struct address_space *mapping, long delta)
+-{
+-	int ret = 0;
+-	struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(mapping->host->i_sb);
+-
+-	if (sbinfo->free_blocks > -1) {
+-		spin_lock(&sbinfo->stat_lock);
+-		if (sbinfo->free_blocks - delta >= 0)
+-			sbinfo->free_blocks -= delta;
+-		else
+-			ret = -ENOMEM;
+-		spin_unlock(&sbinfo->stat_lock);
+-	}
+-
+-	return ret;
+-}
+-
+-void hugetlb_put_quota(struct address_space *mapping, long delta)
+-{
+-	struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(mapping->host->i_sb);
+-
+-	if (sbinfo->free_blocks > -1) {
+-		spin_lock(&sbinfo->stat_lock);
+-		sbinfo->free_blocks += delta;
+-		spin_unlock(&sbinfo->stat_lock);
+-	}
+-}
+-
+ static struct dentry *hugetlbfs_mount(struct file_system_type *fs_type,
+ 	int flags, const char *dev_name, void *data)
+ {
+diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
+index 7adc492..cf01817 100644
+--- a/include/linux/hugetlb.h
++++ b/include/linux/hugetlb.h
+@@ -14,6 +14,15 @@ struct user_struct;
+ #include <linux/shm.h>
+ #include <asm/tlbflush.h>
+ 
++struct hugepage_subpool {
++	spinlock_t lock;
++	long count;
++	long max_hpages, used_hpages;
++};
++
++struct hugepage_subpool *hugepage_new_subpool(long nr_blocks);
++void hugepage_put_subpool(struct hugepage_subpool *spool);
++
+ int PageHuge(struct page *page);
+ 
+ void reset_vma_resv_huge_pages(struct vm_area_struct *vma);
+@@ -129,12 +138,11 @@ enum {
+ };
+ 
+ struct hugetlbfs_sb_info {
+-	long	max_blocks;   /* blocks allowed */
+-	long	free_blocks;  /* blocks free */
+ 	long	max_inodes;   /* inodes allowed */
+ 	long	free_inodes;  /* inodes free */
+ 	spinlock_t	stat_lock;
+ 	struct hstate *hstate;
++	struct hugepage_subpool *spool;
+ };
+ 
+ 
+@@ -146,8 +154,6 @@ extern const struct file_operations hugetlbfs_file_operations;
+ extern const struct vm_operations_struct hugetlb_vm_ops;
+ struct file *hugetlb_file_setup(const char *name, size_t size, vm_flags_t acct,
+ 				struct user_struct **user, int creat_flags);
+-int hugetlb_get_quota(struct address_space *mapping, long delta);
+-void hugetlb_put_quota(struct address_space *mapping, long delta);
+ 
+ static inline int is_file_hugepages(struct file *file)
+ {
+diff --git a/mm/hugetlb.c b/mm/hugetlb.c
+index b1c3148..afa057a 100644
+--- a/mm/hugetlb.c
++++ b/mm/hugetlb.c
+@@ -53,6 +53,84 @@ static unsigned long __initdata default_hstate_size;
+  */
+ static DEFINE_SPINLOCK(hugetlb_lock);
+ 
++static inline void unlock_or_release_subpool(struct hugepage_subpool *spool)
++{
++	bool free = (spool->count == 0) && (spool->used_hpages == 0);
++
++	spin_unlock(&spool->lock);
++
++	/* If no pages are used, and no other handles to the subpool
++	 * remain, free the subpool the subpool remain */
++	if (free)
++		kfree(spool);
++}
++
++struct hugepage_subpool *hugepage_new_subpool(long nr_blocks)
++{
++	struct hugepage_subpool *spool;
++
++	spool = kmalloc(sizeof(*spool), GFP_KERNEL);
++	if (!spool)
++		return NULL;
++
++	spin_lock_init(&spool->lock);
++	spool->count = 1;
++	spool->max_hpages = nr_blocks;
++	spool->used_hpages = 0;
++
++	return spool;
++}
++
++void hugepage_put_subpool(struct hugepage_subpool *spool)
++{
++	spin_lock(&spool->lock);
++	BUG_ON(!spool->count);
++	spool->count--;
++	unlock_or_release_subpool(spool);
++}
++
++static int hugepage_subpool_get_pages(struct hugepage_subpool *spool,
++				      long delta)
++{
++	int ret = 0;
++
++	if (!spool)
++		return 0;
++
++	spin_lock(&spool->lock);
++	if ((spool->used_hpages + delta) <= spool->max_hpages) {
++		spool->used_hpages += delta;
++	} else {
++		ret = -ENOMEM;
++	}
++	spin_unlock(&spool->lock);
++
++	return ret;
++}
++
++static void hugepage_subpool_put_pages(struct hugepage_subpool *spool,
++				       long delta)
++{
++	if (!spool)
++		return;
++
++	spin_lock(&spool->lock);
++	spool->used_hpages -= delta;
++	/* If hugetlbfs_put_super couldn't free spool due to
++	* an outstanding quota reference, free it now. */
++	unlock_or_release_subpool(spool);
++}
++
++static inline struct hugepage_subpool *subpool_inode(struct inode *inode)
++{
++	return HUGETLBFS_SB(inode->i_sb)->spool;
++}
++
++static inline struct hugepage_subpool *subpool_vma(struct vm_area_struct *vma)
++{
++	return subpool_inode(vma->vm_file->f_dentry->d_inode);
++}
++
+ /*
+  * Region tracking -- allows tracking of reservations and instantiated pages
+  *                    across the pages in a mapping.
+@@ -540,9 +618,9 @@ static void free_huge_page(struct page *page)
+ 	 */
+ 	struct hstate *h = page_hstate(page);
+ 	int nid = page_to_nid(page);
+-	struct address_space *mapping;
++	struct hugepage_subpool *spool =
++		(struct hugepage_subpool *)page_private(page);
+ 
+-	mapping = (struct address_space *) page_private(page);
+ 	set_page_private(page, 0);
+ 	page->mapping = NULL;
+ 	BUG_ON(page_count(page));
+@@ -558,8 +636,7 @@ static void free_huge_page(struct page *page)
+ 		enqueue_huge_page(h, page);
+ 	}
+ 	spin_unlock(&hugetlb_lock);
+-	if (mapping)
+-		hugetlb_put_quota(mapping, 1);
++	hugepage_subpool_put_pages(spool, 1);
+ }
+ 
+ static void prep_new_huge_page(struct hstate *h, struct page *page, int nid)
+@@ -977,11 +1054,12 @@ static void return_unused_surplus_pages(struct hstate *h,
+ /*
+  * Determine if the huge page at addr within the vma has an associated
+  * reservation.  Where it does not we will need to logically increase
+- * reservation and actually increase quota before an allocation can occur.
+- * Where any new reservation would be required the reservation change is
+- * prepared, but not committed.  Once the page has been quota'd allocated
+- * an instantiated the change should be committed via vma_commit_reservation.
+- * No action is required on failure.
++ * reservation and actually increase subpool usage before an allocation
++ * can occur.  Where any new reservation would be required the
++ * reservation change is prepared, but not committed.  Once the page
++ * has been allocated from the subpool and instantiated the change should
++ * be committed via vma_commit_reservation.  No action is required on
++ * failure.
+  */
+ static long vma_needs_reservation(struct hstate *h,
+ 			struct vm_area_struct *vma, unsigned long addr)
+@@ -1030,24 +1108,24 @@ static void vma_commit_reservation(struct hstate *h,
+ static struct page *alloc_huge_page(struct vm_area_struct *vma,
+ 				    unsigned long addr, int avoid_reserve)
+ {
++	struct hugepage_subpool *spool = subpool_vma(vma);
+ 	struct hstate *h = hstate_vma(vma);
+ 	struct page *page;
+-	struct address_space *mapping = vma->vm_file->f_mapping;
+-	struct inode *inode = mapping->host;
+ 	long chg;
+ 
+ 	/*
+-	 * Processes that did not create the mapping will have no reserves and
+-	 * will not have accounted against quota. Check that the quota can be
+-	 * made before satisfying the allocation
+-	 * MAP_NORESERVE mappings may also need pages and quota allocated
+-	 * if no reserve mapping overlaps.
++	 * Processes that did not create the mapping will have no
++	 * reserves and will not have accounted against subpool
++	 * limit. Check that the subpool limit can be made before
++	 * satisfying the allocation MAP_NORESERVE mappings may also
++	 * need pages and subpool limit allocated allocated if no reserve
++	 * mapping overlaps.
+ 	 */
+ 	chg = vma_needs_reservation(h, vma, addr);
+ 	if (chg < 0)
+ 		return ERR_PTR(-VM_FAULT_OOM);
+ 	if (chg)
+-		if (hugetlb_get_quota(inode->i_mapping, chg))
++		if (hugepage_subpool_get_pages(spool, chg))
+ 			return ERR_PTR(-VM_FAULT_SIGBUS);
+ 
+ 	spin_lock(&hugetlb_lock);
+@@ -1057,12 +1135,12 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
+ 	if (!page) {
+ 		page = alloc_buddy_huge_page(h, NUMA_NO_NODE);
+ 		if (!page) {
+-			hugetlb_put_quota(inode->i_mapping, chg);
++			hugepage_subpool_put_pages(spool, chg);
+ 			return ERR_PTR(-VM_FAULT_SIGBUS);
+ 		}
+ 	}
+ 
+-	set_page_private(page, (unsigned long) mapping);
++	set_page_private(page, (unsigned long)spool);
+ 
+ 	vma_commit_reservation(h, vma, addr);
+ 
+@@ -2083,6 +2161,7 @@ static void hugetlb_vm_op_close(struct vm_area_struct *vma)
+ {
+ 	struct hstate *h = hstate_vma(vma);
+ 	struct resv_map *reservations = vma_resv_map(vma);
++	struct hugepage_subpool *spool = subpool_vma(vma);
+ 	unsigned long reserve;
+ 	unsigned long start;
+ 	unsigned long end;
+@@ -2098,7 +2177,7 @@ static void hugetlb_vm_op_close(struct vm_area_struct *vma)
+ 
+ 		if (reserve) {
+ 			hugetlb_acct_memory(h, -reserve);
+-			hugetlb_put_quota(vma->vm_file->f_mapping, reserve);
++			hugepage_subpool_put_pages(spool, reserve);
+ 		}
+ 	}
+ }
+@@ -2331,7 +2410,7 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+ 	address = address & huge_page_mask(h);
+ 	pgoff = ((address - vma->vm_start) >> PAGE_SHIFT)
+ 		+ (vma->vm_pgoff >> PAGE_SHIFT);
+-	mapping = (struct address_space *)page_private(page);
++	mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
+ 
+ 	/*
+ 	 * Take the mapping lock for the duration of the table walk. As
+@@ -2884,11 +2963,12 @@ int hugetlb_reserve_pages(struct inode *inode,
+ {
+ 	long ret, chg;
+ 	struct hstate *h = hstate_inode(inode);
++	struct hugepage_subpool *spool = subpool_inode(inode);
+ 
+ 	/*
+ 	 * Only apply hugepage reservation if asked. At fault time, an
+ 	 * attempt will be made for VM_NORESERVE to allocate a page
+-	 * and filesystem quota without using reserves
++	 * without using reserves
+ 	 */
+ 	if (vm_flags & VM_NORESERVE)
+ 		return 0;
+@@ -2915,19 +2995,19 @@ int hugetlb_reserve_pages(struct inode *inode,
+ 		goto out_err;
+ 	}
+ 
+-	/* There must be enough filesystem quota for the mapping */
+-	if (hugetlb_get_quota(inode->i_mapping, chg)) {
++	/* There must be enough pages in the subpool for the mapping */
++	if (hugepage_subpool_get_pages(spool, chg)) {
+ 		ret = -ENOSPC;
+ 		goto out_err;
+ 	}
+ 
+ 	/*
+ 	 * Check enough hugepages are available for the reservation.
+-	 * Hand back the quota if there are not
++	 * Hand the pages back to the subpool if there are not
+ 	 */
+ 	ret = hugetlb_acct_memory(h, chg);
+ 	if (ret < 0) {
+-		hugetlb_put_quota(inode->i_mapping, chg);
++		hugepage_subpool_put_pages(spool, chg);
+ 		goto out_err;
+ 	}
+ 
+@@ -2949,12 +3029,13 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed)
+ {
+ 	struct hstate *h = hstate_inode(inode);
+ 	long chg = region_truncate(&inode->i_mapping->private_list, offset);
++	struct hugepage_subpool *spool = subpool_inode(inode);
+ 
+ 	spin_lock(&inode->i_lock);
+ 	inode->i_blocks -= (blocks_per_huge_page(h) * freed);
+ 	spin_unlock(&inode->i_lock);
+ 
+-	hugetlb_put_quota(inode->i_mapping, (chg - freed));
++	hugepage_subpool_put_pages(spool, (chg - freed));
+ 	hugetlb_acct_memory(h, -(chg - freed));
+ }
+ 

Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch (from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch)
@@ -0,0 +1,95 @@
+From: Dave Hansen <dave at linux.vnet.ibm.com>
+Date: Fri, 18 May 2012 11:46:30 -0700
+Subject: hugetlb: fix resv_map leak in error path
+
+commit c50ac050811d6485616a193eb0f37bfbd191cc89 upstream.
+
+When called for anonymous (non-shared) mappings, hugetlb_reserve_pages()
+does a resv_map_alloc().  It depends on code in hugetlbfs's
+vm_ops->close() to release that allocation.
+
+However, in the mmap() failure path, we do a plain unmap_region() without
+the remove_vma() which actually calls vm_ops->close().
+
+This is a decent fix.  This leak could get reintroduced if new code (say,
+after hugetlb_reserve_pages() in hugetlbfs_file_mmap()) decides to return
+an error.  But, I think it would have to unroll the reservation anyway.
+
+Christoph's test case:
+
+	http://marc.info/?l=linux-mm&m=133728900729735
+
+Signed-off-by: Dave Hansen <dave at linux.vnet.ibm.com>
+[Christoph Lameter: I have rediffed the patch against 2.6.32 and 3.2.0.]
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ mm/hugetlb.c |   28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+--- a/mm/hugetlb.c
++++ b/mm/hugetlb.c
+@@ -2068,6 +2068,15 @@
+ 		kref_get(&reservations->refs);
+ }
+ 
++static void resv_map_put(struct vm_area_struct *vma)
++{
++	struct resv_map *reservations = vma_resv_map(vma);
++
++	if (!reservations)
++		return;
++	kref_put(&reservations->refs, resv_map_release);
++}
++
+ static void hugetlb_vm_op_close(struct vm_area_struct *vma)
+ {
+ 	struct hstate *h = hstate_vma(vma);
+@@ -2083,7 +2092,7 @@
+ 		reserve = (end - start) -
+ 			region_count(&reservations->regions, start, end);
+ 
+-		kref_put(&reservations->refs, resv_map_release);
++		resv_map_put(vma);
+ 
+ 		if (reserve) {
+ 			hugetlb_acct_memory(h, -reserve);
+@@ -2884,12 +2893,16 @@
+ 		set_vma_resv_flags(vma, HPAGE_RESV_OWNER);
+ 	}
+ 
+-	if (chg < 0)
+-		return chg;
++	if (chg < 0) {
++		ret = chg;
++		goto out_err;
++	}
+ 
+ 	/* There must be enough filesystem quota for the mapping */
+-	if (hugetlb_get_quota(inode->i_mapping, chg))
+-		return -ENOSPC;
++	if (hugetlb_get_quota(inode->i_mapping, chg)) {
++		ret = -ENOSPC;
++		goto out_err;
++	}
+ 
+ 	/*
+ 	 * Check enough hugepages are available for the reservation.
+@@ -2898,7 +2911,7 @@
+ 	ret = hugetlb_acct_memory(h, chg);
+ 	if (ret < 0) {
+ 		hugetlb_put_quota(inode->i_mapping, chg);
+-		return ret;
++		goto out_err;
+ 	}
+ 
+ 	/*
+@@ -2915,6 +2928,9 @@
+ 	if (!vma || vma->vm_flags & VM_MAYSHARE)
+ 		region_add(&inode->i_mapping->private_list, from, to);
+ 	return 0;
++out_err:
++	resv_map_put(vma);
++	return ret;
+ }
+ 
+ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed)

Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch (from r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch)
@@ -0,0 +1,66 @@
+From: Dave Hansen <dave at linux.vnet.ibm.com>
+Date: Wed, 30 May 2012 07:51:07 -0700
+Subject: mm: fix vma_resv_map() NULL pointer
+
+commit 4523e1458566a0e8ecfaff90f380dd23acc44d27 upstream.
+
+hugetlb_reserve_pages() can be used for either normal file-backed
+hugetlbfs mappings, or MAP_HUGETLB.  In the MAP_HUGETLB, semi-anonymous
+mode, there is not a VMA around.  The new call to resv_map_put() assumed
+that there was, and resulted in a NULL pointer dereference:
+
+  BUG: unable to handle kernel NULL pointer dereference at 0000000000000030
+  IP: vma_resv_map+0x9/0x30
+  PGD 141453067 PUD 1421e1067 PMD 0
+  Oops: 0000 [#1] PREEMPT SMP
+  ...
+  Pid: 14006, comm: trinity-child6 Not tainted 3.4.0+ #36
+  RIP: vma_resv_map+0x9/0x30
+  ...
+  Process trinity-child6 (pid: 14006, threadinfo ffff8801414e0000, task ffff8801414f26b0)
+  Call Trace:
+    resv_map_put+0xe/0x40
+    hugetlb_reserve_pages+0xa6/0x1d0
+    hugetlb_file_setup+0x102/0x2c0
+    newseg+0x115/0x360
+    ipcget+0x1ce/0x310
+    sys_shmget+0x5a/0x60
+    system_call_fastpath+0x16/0x1b
+
+This was reported by Dave Jones, but was reproducible with the
+libhugetlbfs test cases, so shame on me for not running them in the
+first place.
+
+With this, the oops is gone, and the output of libhugetlbfs's
+run_tests.py is identical to plain 3.4 again.
+
+[ Marked for stable, since this was introduced by commit c50ac050811d
+  ("hugetlb: fix resv_map leak in error path") which was also marked for
+  stable ]
+
+Reported-by: Dave Jones <davej at redhat.com>
+Cc: Mel Gorman <mel at csn.ul.ie>
+Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
+Cc: Christoph Lameter <cl at linux.com>
+Cc: Andrea Arcangeli <aarcange at redhat.com>
+Cc: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ mm/hugetlb.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/mm/hugetlb.c b/mm/hugetlb.c
+index 285a81e..e198831 100644
+--- a/mm/hugetlb.c
++++ b/mm/hugetlb.c
+@@ -3036,7 +3036,8 @@ int hugetlb_reserve_pages(struct inode *inode,
+ 		region_add(&inode->i_mapping->private_list, from, to);
+ 	return 0;
+ out_err:
+-	resv_map_put(vma);
++	if (vma)
++		resv_map_put(vma);
+ 	return ret;
+ }
+ 

Copied: dists/squeeze-backports/linux/debian/patches/bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch (from r19064, dists/sid/linux-2.6/debian/patches/bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch)
@@ -0,0 +1,214 @@
+From: Andrea Arcangeli <aarcange at redhat.com>
+Date: Tue, 29 May 2012 15:06:49 -0700
+Subject: mm: pmd_read_atomic: fix 32bit PAE pmd walk vs pmd_populate SMP race
+ condition
+
+commit 26c191788f18129af0eb32a358cdaea0c7479626 upstream.
+
+When holding the mmap_sem for reading, pmd_offset_map_lock should only
+run on a pmd_t that has been read atomically from the pmdp pointer,
+otherwise we may read only half of it leading to this crash.
+
+PID: 11679  TASK: f06e8000  CPU: 3   COMMAND: "do_race_2_panic"
+ #0 [f06a9dd8] crash_kexec at c049b5ec
+ #1 [f06a9e2c] oops_end at c083d1c2
+ #2 [f06a9e40] no_context at c0433ded
+ #3 [f06a9e64] bad_area_nosemaphore at c043401a
+ #4 [f06a9e6c] __do_page_fault at c0434493
+ #5 [f06a9eec] do_page_fault at c083eb45
+ #6 [f06a9f04] error_code (via page_fault) at c083c5d5
+    EAX: 01fb470c EBX: fff35000 ECX: 00000003 EDX: 00000100 EBP:
+    00000000
+    DS:  007b     ESI: 9e201000 ES:  007b     EDI: 01fb4700 GS:  00e0
+    CS:  0060     EIP: c083bc14 ERR: ffffffff EFLAGS: 00010246
+ #7 [f06a9f38] _spin_lock at c083bc14
+ #8 [f06a9f44] sys_mincore at c0507b7d
+ #9 [f06a9fb0] system_call at c083becd
+                         start           len
+    EAX: ffffffda  EBX: 9e200000  ECX: 00001000  EDX: 6228537f
+    DS:  007b      ESI: 00000000  ES:  007b      EDI: 003d0f00
+    SS:  007b      ESP: 62285354  EBP: 62285388  GS:  0033
+    CS:  0073      EIP: 00291416  ERR: 000000da  EFLAGS: 00000286
+
+This should be a longstanding bug affecting x86 32bit PAE without THP.
+Only archs with 64bit large pmd_t and 32bit unsigned long should be
+affected.
+
+With THP enabled the barrier() in pmd_none_or_trans_huge_or_clear_bad()
+would partly hide the bug when the pmd transition from none to stable,
+by forcing a re-read of the *pmd in pmd_offset_map_lock, but when THP is
+enabled a new set of problem arises by the fact could then transition
+freely in any of the none, pmd_trans_huge or pmd_trans_stable states.
+So making the barrier in pmd_none_or_trans_huge_or_clear_bad()
+unconditional isn't good idea and it would be a flakey solution.
+
+This should be fully fixed by introducing a pmd_read_atomic that reads
+the pmd in order with THP disabled, or by reading the pmd atomically
+with cmpxchg8b with THP enabled.
+
+Luckily this new race condition only triggers in the places that must
+already be covered by pmd_none_or_trans_huge_or_clear_bad() so the fix
+is localized there but this bug is not related to THP.
+
+NOTE: this can trigger on x86 32bit systems with PAE enabled with more
+than 4G of ram, otherwise the high part of the pmd will never risk to be
+truncated because it would be zero at all times, in turn so hiding the
+SMP race.
+
+This bug was discovered and fully debugged by Ulrich, quote:
+
+----
+[..]
+pmd_none_or_trans_huge_or_clear_bad() loads the content of edx and
+eax.
+
+    496 static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t
+    *pmd)
+    497 {
+    498         /* depend on compiler for an atomic pmd read */
+    499         pmd_t pmdval = *pmd;
+
+                                // edi = pmd pointer
+0xc0507a74 <sys_mincore+548>:   mov    0x8(%esp),%edi
+...
+                                // edx = PTE page table high address
+0xc0507a84 <sys_mincore+564>:   mov    0x4(%edi),%edx
+...
+                                // eax = PTE page table low address
+0xc0507a8e <sys_mincore+574>:   mov    (%edi),%eax
+
+[..]
+
+Please note that the PMD is not read atomically. These are two "mov"
+instructions where the high order bits of the PMD entry are fetched
+first. Hence, the above machine code is prone to the following race.
+
+-  The PMD entry {high|low} is 0x0000000000000000.
+   The "mov" at 0xc0507a84 loads 0x00000000 into edx.
+
+-  A page fault (on another CPU) sneaks in between the two "mov"
+   instructions and instantiates the PMD.
+
+-  The PMD entry {high|low} is now 0x00000003fda38067.
+   The "mov" at 0xc0507a8e loads 0xfda38067 into eax.
+----
+
+Reported-by: Ulrich Obergfell <uobergfe at redhat.com>
+Signed-off-by: Andrea Arcangeli <aarcange at redhat.com>
+Cc: Mel Gorman <mgorman at suse.de>
+Cc: Hugh Dickins <hughd at google.com>
+Cc: Larry Woodman <lwoodman at redhat.com>
+Cc: Petr Matousek <pmatouse at redhat.com>
+Cc: Rik van Riel <riel at redhat.com>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/x86/include/asm/pgtable-3level.h |   50 +++++++++++++++++++++++++++++++++
+ include/asm-generic/pgtable.h         |   22 +++++++++++++--
+ 2 files changed, 70 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
+index effff47..43876f1 100644
+--- a/arch/x86/include/asm/pgtable-3level.h
++++ b/arch/x86/include/asm/pgtable-3level.h
+@@ -31,6 +31,56 @@ static inline void native_set_pte(pte_t *ptep, pte_t pte)
+ 	ptep->pte_low = pte.pte_low;
+ }
+ 
++#define pmd_read_atomic pmd_read_atomic
++/*
++ * pte_offset_map_lock on 32bit PAE kernels was reading the pmd_t with
++ * a "*pmdp" dereference done by gcc. Problem is, in certain places
++ * where pte_offset_map_lock is called, concurrent page faults are
++ * allowed, if the mmap_sem is hold for reading. An example is mincore
++ * vs page faults vs MADV_DONTNEED. On the page fault side
++ * pmd_populate rightfully does a set_64bit, but if we're reading the
++ * pmd_t with a "*pmdp" on the mincore side, a SMP race can happen
++ * because gcc will not read the 64bit of the pmd atomically. To fix
++ * this all places running pmd_offset_map_lock() while holding the
++ * mmap_sem in read mode, shall read the pmdp pointer using this
++ * function to know if the pmd is null nor not, and in turn to know if
++ * they can run pmd_offset_map_lock or pmd_trans_huge or other pmd
++ * operations.
++ *
++ * Without THP if the mmap_sem is hold for reading, the
++ * pmd can only transition from null to not null while pmd_read_atomic runs.
++ * So there's no need of literally reading it atomically.
++ *
++ * With THP if the mmap_sem is hold for reading, the pmd can become
++ * THP or null or point to a pte (and in turn become "stable") at any
++ * time under pmd_read_atomic, so it's mandatory to read it atomically
++ * with cmpxchg8b.
++ */
++#ifndef CONFIG_TRANSPARENT_HUGEPAGE
++static inline pmd_t pmd_read_atomic(pmd_t *pmdp)
++{
++	pmdval_t ret;
++	u32 *tmp = (u32 *)pmdp;
++
++	ret = (pmdval_t) (*tmp);
++	if (ret) {
++		/*
++		 * If the low part is null, we must not read the high part
++		 * or we can end up with a partial pmd.
++		 */
++		smp_rmb();
++		ret |= ((pmdval_t)*(tmp + 1)) << 32;
++	}
++
++	return (pmd_t) { ret };
++}
++#else /* CONFIG_TRANSPARENT_HUGEPAGE */
++static inline pmd_t pmd_read_atomic(pmd_t *pmdp)
++{
++	return (pmd_t) { atomic64_read((atomic64_t *)pmdp) };
++}
++#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
++
+ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
+ {
+ 	set_64bit((unsigned long long *)(ptep), native_pte_val(pte));
+diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
+index e2768f1..6f2b45a 100644
+--- a/include/asm-generic/pgtable.h
++++ b/include/asm-generic/pgtable.h
+@@ -445,6 +445,18 @@ static inline int pmd_write(pmd_t pmd)
+ #endif /* __HAVE_ARCH_PMD_WRITE */
+ #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+ 
++#ifndef pmd_read_atomic
++static inline pmd_t pmd_read_atomic(pmd_t *pmdp)
++{
++	/*
++	 * Depend on compiler for an atomic pmd read. NOTE: this is
++	 * only going to work, if the pmdval_t isn't larger than
++	 * an unsigned long.
++	 */
++	return *pmdp;
++}
++#endif
++
+ /*
+  * This function is meant to be used by sites walking pagetables with
+  * the mmap_sem hold in read mode to protect against MADV_DONTNEED and
+@@ -458,11 +470,17 @@ static inline int pmd_write(pmd_t pmd)
+  * undefined so behaving like if the pmd was none is safe (because it
+  * can return none anyway). The compiler level barrier() is critically
+  * important to compute the two checks atomically on the same pmdval.
++ *
++ * For 32bit kernels with a 64bit large pmd_t this automatically takes
++ * care of reading the pmd atomically to avoid SMP race conditions
++ * against pmd_populate() when the mmap_sem is hold for reading by the
++ * caller (a special atomic read not done by "gcc" as in the generic
++ * version above, is also needed when THP is disabled because the page
++ * fault can populate the pmd from under us).
+  */
+ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd)
+ {
+-	/* depend on compiler for an atomic pmd read */
+-	pmd_t pmdval = *pmd;
++	pmd_t pmdval = pmd_read_atomic(pmd);
+ 	/*
+ 	 * The barrier will stabilize the pmdval in a register or on
+ 	 * the stack so that it will stop changing under the code.

Modified: dists/squeeze-backports/linux/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/patches/debian/dfsg/files-1	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/patches/debian/dfsg/files-1	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,7 +1,7 @@
 rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
 
 # Some of this is DFSG-free, but it has been moved to firmware-free so
-# we don't need it in linux-2.6 as well.
+# we don't need it in linux as well.
 rm firmware
 
 rm arch/powerpc/sysdev/micropatch.c
@@ -23,5 +23,9 @@
 rm drivers/staging/wlags49_h2/ap_*.c
 rm drivers/staging/wlags49_h2/sta_*.c
 
+# These include apparently obfuscated code
+rm drivers/video/nvidia/
+rm drivers/video/riva/
+
 rm sound/pci/cs46xx/cs46xx_image.h
 rm sound/pci/cs46xx/imgs

Copied: dists/squeeze-backports/linux/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch (from r19064, dists/sid/linux-2.6/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch)
@@ -0,0 +1,137 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 2 Jun 2012 19:53:38 +0100
+Subject: video: Remove nvidiafb and rivafb
+Bug-Debian: http://bugs.debian.org/383481
+
+These drivers contain register programming code provided by the
+hardware vendor that appears to have been deliberately obfuscated.
+This is arguably not the preferred form for modification.
+
+These drivers are also largely redundant with nouveau.  The RIVA 128
+(NV3) is not supported by nouveau but is about 15 years old and
+probably discontinued 10 years ago.
+
+---
+ drivers/video/Kconfig  |   95 ------------------------------------------------
+ drivers/video/Makefile |    2 -
+ 2 files changed, 97 deletions(-)
+
+diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
+index d83e967..fe92039 100644
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
+@@ -1028,101 +1028,6 @@ config FB_ATMEL_STN
+ 
+ 	  If unsure, say N.
+ 
+-config FB_NVIDIA
+-	tristate "nVidia Framebuffer Support"
+-	depends on FB && PCI
+-	select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT
+-	select FB_MODE_HELPERS
+-	select FB_CFB_FILLRECT
+-	select FB_CFB_COPYAREA
+-	select FB_CFB_IMAGEBLIT
+-	select BITREVERSE
+-	select VGASTATE
+-	help
+-	  This driver supports graphics boards with the nVidia chips, TNT
+-	  and newer. For very old chipsets, such as the RIVA128, then use
+-	  the rivafb.
+-	  Say Y if you have such a graphics board.
+-
+-	  To compile this driver as a module, choose M here: the
+-	  module will be called nvidiafb.
+-
+-config FB_NVIDIA_I2C
+-       bool "Enable DDC Support"
+-       depends on FB_NVIDIA
+-       select FB_DDC
+-       help
+-	  This enables I2C support for nVidia Chipsets.  This is used
+-	  only for getting EDID information from the attached display
+-	  allowing for robust video mode handling and switching.
+-
+-	  Because fbdev-2.6 requires that drivers must be able to
+-	  independently validate video mode parameters, you should say Y
+-	  here.
+-
+-config FB_NVIDIA_DEBUG
+-	bool "Lots of debug output"
+-	depends on FB_NVIDIA
+-	default n
+-	help
+-	  Say Y here if you want the nVidia driver to output all sorts
+-	  of debugging information to provide to the maintainer when
+-	  something goes wrong.
+-
+-config FB_NVIDIA_BACKLIGHT
+-	bool "Support for backlight control"
+-	depends on FB_NVIDIA
+-	default y
+-	help
+-	  Say Y here if you want to control the backlight of your display.
+-
+-config FB_RIVA
+-	tristate "nVidia Riva support"
+-	depends on FB && PCI
+-	select FB_BACKLIGHT if FB_RIVA_BACKLIGHT
+-	select FB_MODE_HELPERS
+-	select FB_CFB_FILLRECT
+-	select FB_CFB_COPYAREA
+-	select FB_CFB_IMAGEBLIT
+-	select BITREVERSE
+-	select VGASTATE
+-	help
+-	  This driver supports graphics boards with the nVidia Riva/Geforce
+-	  chips.
+-	  Say Y if you have such a graphics board.
+-
+-	  To compile this driver as a module, choose M here: the
+-	  module will be called rivafb.
+-
+-config FB_RIVA_I2C
+-       bool "Enable DDC Support"
+-       depends on FB_RIVA
+-       select FB_DDC
+-       help
+-	  This enables I2C support for nVidia Chipsets.  This is used
+-	  only for getting EDID information from the attached display
+-	  allowing for robust video mode handling and switching.
+-
+-	  Because fbdev-2.6 requires that drivers must be able to
+-	  independently validate video mode parameters, you should say Y
+-	  here.
+-
+-config FB_RIVA_DEBUG
+-	bool "Lots of debug output"
+-	depends on FB_RIVA
+-	default n
+-	help
+-	  Say Y here if you want the Riva driver to output all sorts
+-	  of debugging information to provide to the maintainer when
+-	  something goes wrong.
+-
+-config FB_RIVA_BACKLIGHT
+-	bool "Support for backlight control"
+-	depends on FB_RIVA
+-	default y
+-	help
+-	  Say Y here if you want to control the backlight of your display.
+-
+ config FB_I810
+ 	tristate "Intel 810/815 support (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
+diff --git a/drivers/video/Makefile b/drivers/video/Makefile
+index 9b9d8ff..4361446 100644
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
+@@ -38,8 +38,6 @@ obj-$(CONFIG_FB_PM2)              += pm2fb.o
+ obj-$(CONFIG_FB_PM3)		  += pm3fb.o
+ 
+ obj-$(CONFIG_FB_MATROX)		  += matrox/
+-obj-$(CONFIG_FB_RIVA)		  += riva/
+-obj-$(CONFIG_FB_NVIDIA)		  += nvidia/
+ obj-$(CONFIG_FB_ATY)		  += aty/ macmodes.o
+ obj-$(CONFIG_FB_ATY128)		  += aty/ macmodes.o
+ obj-$(CONFIG_FB_RADEON)		  += aty/

Copied: dists/squeeze-backports/linux/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch (from r19064, dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch)
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 31 May 2012 04:04:55 +0100
+Subject: [PATCH] mmc: Avoid ABI change in 3.2.19
+
+---
+ include/linux/mmc/host.h |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
+index deb6282..20caeb0 100644
+--- a/include/linux/mmc/host.h
++++ b/include/linux/mmc/host.h
+@@ -303,7 +303,6 @@ struct mmc_host {
+ 
+ 	unsigned int		sdio_irqs;
+ 	struct task_struct	*sdio_irq_thread;
+-	bool			sdio_irq_pending;
+ 	atomic_t		sdio_irq_thread_abort;
+ 
+ 	mmc_pm_flag_t		pm_flags;	/* requested pm features */
+@@ -315,6 +314,10 @@ struct mmc_host {
+ #ifdef CONFIG_REGULATOR
+ 	bool			regulator_enabled; /* regulator state */
+ #endif
++#if !(defined(__GENKSYMS__) && defined(CONFIG_REGULATOR))
++	/* Use the hole after regulator_enabled to avoid an ABI change */
++	bool			sdio_irq_pending;
++#endif
+ 
+ 	struct dentry		*debugfs_root;
+ 
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/features/all/AppArmor-compatibility-patch-for-v5-interface.patch (from r19064, dists/sid/linux-2.6/debian/patches/features/all/AppArmor-compatibility-patch-for-v5-interface.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/all/AppArmor-compatibility-patch-for-v5-interface.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/features/all/AppArmor-compatibility-patch-for-v5-interface.patch)
@@ -0,0 +1,381 @@
+From: John Johansen <john.johansen at canonical.com>
+Date: Wed, 10 Aug 2011 22:02:40 -0700
+Subject: AppArmor: compatibility patch for v5 interface
+
+commit 004192fb5223c7b81a949e36a080a5da56132826 in
+git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
+
+Signed-off-by: John Johansen <john.johansen at canonical.com>
+[bwh: Fix up context to apply without the v5 network control interface;
+ fix unmatched aafs_create() when CONFIG_SECURITY_APPARMOR_COMPAT_24 not set]
+---
+ security/apparmor/Kconfig              |    9 +
+ security/apparmor/Makefile             |    1 +
+ security/apparmor/apparmorfs-24.c      |  287 ++++++++++++++++++++++++++++++++
+ security/apparmor/apparmorfs.c         |   18 +-
+ security/apparmor/include/apparmorfs.h |    6 +
+ 5 files changed, 319 insertions(+), 2 deletions(-)
+ create mode 100644 security/apparmor/apparmorfs-24.c
+
+--- a/security/apparmor/Kconfig
++++ b/security/apparmor/Kconfig
+@@ -29,3 +29,12 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
+ 	  boot.
+ 
+ 	  If you are unsure how to answer this question, answer 1.
++
++config SECURITY_APPARMOR_COMPAT_24
++	bool "Enable AppArmor 2.4 compatability"
++	depends on SECURITY_APPARMOR
++	default y
++	help
++	  This option enables compatability with AppArmor 2.4.  It is
++          recommended if compatability with older versions of AppArmor
++          is desired.
+--- a/security/apparmor/Makefile
++++ b/security/apparmor/Makefile
+@@ -5,6 +5,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
+ apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
+               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
+               resource.o sid.o file.o
++apparmor-$(CONFIG_SECURITY_APPARMOR_COMPAT_24) += apparmorfs-24.o
+ 
+ clean-files := capability_names.h rlim_names.h
+ 
+--- /dev/null
++++ b/security/apparmor/apparmorfs-24.c
+@@ -0,0 +1,287 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor /sys/kernel/secrutiy/apparmor interface functions
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2010 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ *
++ *
++ * This file contain functions providing an interface for <= AppArmor 2.4
++ * compatibility.  It is dependent on CONFIG_SECURITY_APPARMOR_COMPAT_24
++ * being set (see Makefile).
++ */
++
++#include <linux/security.h>
++#include <linux/vmalloc.h>
++#include <linux/module.h>
++#include <linux/seq_file.h>
++#include <linux/uaccess.h>
++#include <linux/namei.h>
++
++#include "include/apparmor.h"
++#include "include/audit.h"
++#include "include/context.h"
++#include "include/policy.h"
++
++
++/* apparmor/matching */
++static ssize_t aa_matching_read(struct file *file, char __user *buf,
++				size_t size, loff_t *ppos)
++{
++	const char matching[] = "pattern=aadfa audit perms=crwxamlk/ "
++	    "user::other";
++
++	return simple_read_from_buffer(buf, size, ppos, matching,
++				       sizeof(matching) - 1);
++}
++
++const struct file_operations aa_fs_matching_fops = {
++	.read = aa_matching_read,
++};
++
++/* apparmor/features */
++static ssize_t aa_features_read(struct file *file, char __user *buf,
++				size_t size, loff_t *ppos)
++{
++	const char features[] = "file=3.1 capability=2.0 network=1.0 "
++	    "change_hat=1.5 change_profile=1.1 " "aanamespaces=1.1 rlimit=1.1";
++
++	return simple_read_from_buffer(buf, size, ppos, features,
++				       sizeof(features) - 1);
++}
++
++const struct file_operations aa_fs_features_fops = {
++	.read = aa_features_read,
++};
++
++/**
++ * __next_namespace - find the next namespace to list
++ * @root: root namespace to stop search at (NOT NULL)
++ * @ns: current ns position (NOT NULL)
++ *
++ * Find the next namespace from @ns under @root and handle all locking needed
++ * while switching current namespace.
++ *
++ * Returns: next namespace or NULL if at last namespace under @root
++ * NOTE: will not unlock root->lock
++ */
++static struct aa_namespace *__next_namespace(struct aa_namespace *root,
++					     struct aa_namespace *ns)
++{
++	struct aa_namespace *parent;
++
++	/* is next namespace a child */
++	if (!list_empty(&ns->sub_ns)) {
++		struct aa_namespace *next;
++		next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
++		read_lock(&next->lock);
++		return next;
++	}
++
++	/* check if the next ns is a sibling, parent, gp, .. */
++	parent = ns->parent;
++	while (parent) {
++		read_unlock(&ns->lock);
++		list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
++			read_lock(&ns->lock);
++			return ns;
++		}
++		if (parent == root)
++			return NULL;
++		ns = parent;
++		parent = parent->parent;
++	}
++
++	return NULL;
++}
++
++/**
++ * __first_profile - find the first profile in a namespace
++ * @root: namespace that is root of profiles being displayed (NOT NULL)
++ * @ns: namespace to start in   (NOT NULL)
++ *
++ * Returns: unrefcounted profile or NULL if no profile
++ */
++static struct aa_profile *__first_profile(struct aa_namespace *root,
++					  struct aa_namespace *ns)
++{
++	for ( ; ns; ns = __next_namespace(root, ns)) {
++		if (!list_empty(&ns->base.profiles))
++			return list_first_entry(&ns->base.profiles,
++						struct aa_profile, base.list);
++	}
++	return NULL;
++}
++
++/**
++ * __next_profile - step to the next profile in a profile tree
++ * @profile: current profile in tree (NOT NULL)
++ *
++ * Perform a depth first taversal on the profile tree in a namespace
++ *
++ * Returns: next profile or NULL if done
++ * Requires: profile->ns.lock to be held
++ */
++static struct aa_profile *__next_profile(struct aa_profile *p)
++{
++	struct aa_profile *parent;
++	struct aa_namespace *ns = p->ns;
++
++	/* is next profile a child */
++	if (!list_empty(&p->base.profiles))
++		return list_first_entry(&p->base.profiles, typeof(*p),
++					base.list);
++
++	/* is next profile a sibling, parent sibling, gp, subling, .. */
++	parent = p->parent;
++	while (parent) {
++		list_for_each_entry_continue(p, &parent->base.profiles,
++					     base.list)
++				return p;
++		p = parent;
++		parent = parent->parent;
++	}
++
++	/* is next another profile in the namespace */
++	list_for_each_entry_continue(p, &ns->base.profiles, base.list)
++		return p;
++
++	return NULL;
++}
++
++/**
++ * next_profile - step to the next profile in where ever it may be
++ * @root: root namespace  (NOT NULL)
++ * @profile: current profile  (NOT NULL)
++ *
++ * Returns: next profile or NULL if there isn't one
++ */
++static struct aa_profile *next_profile(struct aa_namespace *root,
++				       struct aa_profile *profile)
++{
++	struct aa_profile *next = __next_profile(profile);
++	if (next)
++		return next;
++
++	/* finished all profiles in namespace move to next namespace */
++	return __first_profile(root, __next_namespace(root, profile->ns));
++}
++
++/**
++ * p_start - start a depth first traversal of profile tree
++ * @f: seq_file to fill
++ * @pos: current position
++ *
++ * Returns: first profile under current namespace or NULL if none found
++ *
++ * acquires first ns->lock
++ */
++static void *p_start(struct seq_file *f, loff_t *pos)
++	__acquires(root->lock)
++{
++	struct aa_profile *profile = NULL;
++	struct aa_namespace *root = aa_current_profile()->ns;
++	loff_t l = *pos;
++	f->private = aa_get_namespace(root);
++
++
++	/* find the first profile */
++	read_lock(&root->lock);
++	profile = __first_profile(root, root);
++
++	/* skip to position */
++	for (; profile && l > 0; l--)
++		profile = next_profile(root, profile);
++
++	return profile;
++}
++
++/**
++ * p_next - read the next profile entry
++ * @f: seq_file to fill
++ * @p: profile previously returned
++ * @pos: current position
++ *
++ * Returns: next profile after @p or NULL if none
++ *
++ * may acquire/release locks in namespace tree as necessary
++ */
++static void *p_next(struct seq_file *f, void *p, loff_t *pos)
++{
++	struct aa_profile *profile = p;
++	struct aa_namespace *root = f->private;
++	(*pos)++;
++
++	return next_profile(root, profile);
++}
++
++/**
++ * p_stop - stop depth first traversal
++ * @f: seq_file we are filling
++ * @p: the last profile writen
++ *
++ * Release all locking done by p_start/p_next on namespace tree
++ */
++static void p_stop(struct seq_file *f, void *p)
++	__releases(root->lock)
++{
++	struct aa_profile *profile = p;
++	struct aa_namespace *root = f->private, *ns;
++
++	if (profile) {
++		for (ns = profile->ns; ns && ns != root; ns = ns->parent)
++			read_unlock(&ns->lock);
++	}
++	read_unlock(&root->lock);
++	aa_put_namespace(root);
++}
++
++/**
++ * seq_show_profile - show a profile entry
++ * @f: seq_file to file
++ * @p: current position (profile)    (NOT NULL)
++ *
++ * Returns: error on failure
++ */
++static int seq_show_profile(struct seq_file *f, void *p)
++{
++	struct aa_profile *profile = (struct aa_profile *)p;
++	struct aa_namespace *root = f->private;
++
++	if (profile->ns != root)
++		seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
++	seq_printf(f, "%s (%s)\n", profile->base.hname,
++		   COMPLAIN_MODE(profile) ? "complain" : "enforce");
++
++	return 0;
++}
++
++static const struct seq_operations aa_fs_profiles_op = {
++	.start = p_start,
++	.next = p_next,
++	.stop = p_stop,
++	.show = seq_show_profile,
++};
++
++static int profiles_open(struct inode *inode, struct file *file)
++{
++	return seq_open(file, &aa_fs_profiles_op);
++}
++
++static int profiles_release(struct inode *inode, struct file *file)
++{
++	return seq_release(inode, file);
++}
++
++const struct file_operations aa_fs_profiles_fops = {
++	.open = profiles_open,
++	.read = seq_read,
++	.llseek = seq_lseek,
++	.release = profiles_release,
++};
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -187,7 +187,11 @@ void __init aa_destroy_aafs(void)
+ 		aafs_remove(".remove");
+ 		aafs_remove(".replace");
+ 		aafs_remove(".load");
+-
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++		aafs_remove("profiles");
++		aafs_remove("matching");
++		aafs_remove("features");
++#endif
+ 		securityfs_remove(aa_fs_dentry);
+ 		aa_fs_dentry = NULL;
+ 	}
+@@ -218,7 +222,17 @@ static int __init aa_create_aafs(void)
+ 		aa_fs_dentry = NULL;
+ 		goto error;
+ 	}
+-
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++	error = aafs_create("matching", 0444, &aa_fs_matching_fops);
++	if (error)
++		goto error;
++	error = aafs_create("features", 0444, &aa_fs_features_fops);
++	if (error)
++		goto error;
++	error = aafs_create("profiles", 0440, &aa_fs_profiles_fops);
++	if (error)
++		goto error;
++#endif
+ 	error = aafs_create(".load", 0640, &aa_fs_profile_load);
+ 	if (error)
+ 		goto error;
+--- a/security/apparmor/include/apparmorfs.h
++++ b/security/apparmor/include/apparmorfs.h
+@@ -17,4 +17,10 @@
+ 
+ extern void __init aa_destroy_aafs(void);
+ 
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++extern const struct file_operations aa_fs_matching_fops;
++extern const struct file_operations aa_fs_features_fops;
++extern const struct file_operations aa_fs_profiles_fops;
++#endif
++
+ #endif /* __AA_APPARMORFS_H */

Copied: dists/squeeze-backports/linux/debian/patches/features/all/flow_dissector-use-a-64bit-load-store.patch (from r19064, dists/sid/linux-2.6/debian/patches/features/all/flow_dissector-use-a-64bit-load-store.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/all/flow_dissector-use-a-64bit-load-store.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/features/all/flow_dissector-use-a-64bit-load-store.patch)
@@ -0,0 +1,90 @@
+From: Eric Dumazet <eric.dumazet at gmail.com>
+Date: Mon, 28 Nov 2011 20:30:35 +0000
+Subject: [PATCH 2/3] flow_dissector: use a 64bit load/store
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 4d77d2b567ec66a443792d99e96ac760991d80d0 upstream.
+
+Le lundi 28 novembre 2011 à 19:06 -0500, David Miller a écrit :
+> From: Dimitris Michailidis <dm at chelsio.com>
+> Date: Mon, 28 Nov 2011 08:25:39 -0800
+>
+> >> +bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys
+> >> *flow)
+> >> +{
+> >> +	int poff, nhoff = skb_network_offset(skb);
+> >> +	u8 ip_proto;
+> >> +	u16 proto = skb->protocol;
+> >
+> > __be16 instead of u16 for proto?
+>
+> I'll take care of this when I apply these patches.
+
+( CC trimmed )
+
+Thanks David !
+
+Here is a small patch to use one 64bit load/store on x86_64 instead of
+two 32bit load/stores.
+
+[PATCH net-next] flow_dissector: use a 64bit load/store
+
+gcc compiler is smart enough to use a single load/store if we
+memcpy(dptr, sptr, 8) on x86_64, regardless of
+CONFIG_CC_OPTIMIZE_FOR_SIZE
+
+In IP header, daddr immediately follows saddr, this wont change in the
+future. We only need to make sure our flow_keys (src,dst) fields wont
+break the rule.
+
+Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
+index e4cb285..80461c1 100644
+--- a/include/net/flow_keys.h
++++ b/include/net/flow_keys.h
+@@ -2,6 +2,7 @@
+ #define _NET_FLOW_KEYS_H
+ 
+ struct flow_keys {
++	/* (src,dst) must be grouped, in the same way than in IP header */
+ 	__be32 src;
+ 	__be32 dst;
+ 	union {
+diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
+index f0516d9..0985b9b 100644
+--- a/net/core/flow_dissector.c
++++ b/net/core/flow_dissector.c
+@@ -8,6 +8,16 @@
+ #include <linux/ppp_defs.h>
+ #include <net/flow_keys.h>
+ 
++/* copy saddr & daddr, possibly using 64bit load/store
++ * Equivalent to :	flow->src = iph->saddr;
++ *			flow->dst = iph->daddr;
++ */
++static void iph_to_flow_copy_addrs(struct flow_keys *flow, const struct iphdr *iph)
++{
++	BUILD_BUG_ON(offsetof(typeof(*flow), dst) !=
++		     offsetof(typeof(*flow), src) + sizeof(flow->src));
++	memcpy(&flow->src, &iph->saddr, sizeof(flow->src) + sizeof(flow->dst));
++}
+ 
+ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
+ {
+@@ -31,8 +41,7 @@ ip:
+ 			ip_proto = 0;
+ 		else
+ 			ip_proto = iph->protocol;
+-		flow->src = iph->saddr;
+-		flow->dst = iph->daddr;
++		iph_to_flow_copy_addrs(flow, iph);
+ 		nhoff += iph->ihl * 4;
+ 		break;
+ 	}
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/features/all/net-flow_dissector.c-missing-include-linux-export.h.patch (from r19064, dists/sid/linux-2.6/debian/patches/features/all/net-flow_dissector.c-missing-include-linux-export.h.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/all/net-flow_dissector.c-missing-include-linux-export.h.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/features/all/net-flow_dissector.c-missing-include-linux-export.h.patch)
@@ -0,0 +1,25 @@
+From: Jesper Dangaard Brouer <hawk at comx.dk>
+Date: Tue, 24 Jan 2012 16:03:33 -0500
+Subject: [PATCH 3/3] net: flow_dissector.c missing include linux/export.h
+
+commit c452ed70771cea3af73d21a5914989137fbd28b8 upstream.
+
+The file net/core/flow_dissector.c seems to be missing
+including linux/export.h.
+
+Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
+index 0985b9b..a225089 100644
+--- a/net/core/flow_dissector.c
++++ b/net/core/flow_dissector.c
+@@ -1,4 +1,5 @@
+ #include <linux/skbuff.h>
++#include <linux/export.h>
+ #include <linux/ip.h>
+ #include <linux/ipv6.h>
+ #include <linux/if_vlan.h>
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/features/all/net-introduce-skb_flow_dissect.patch (from r19064, dists/sid/linux-2.6/debian/patches/features/all/net-introduce-skb_flow_dissect.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/all/net-introduce-skb_flow_dissect.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/features/all/net-introduce-skb_flow_dissect.patch)
@@ -0,0 +1,195 @@
+From: Eric Dumazet <eric.dumazet at gmail.com>
+Date: Mon, 28 Nov 2011 05:22:18 +0000
+Subject: [PATCH 1/3] net: introduce skb_flow_dissect()
+
+commit 0744dd00c1b1be99a25b62b1b48df440e82e57e0 upstream.
+
+We use at least two flow dissectors in network stack, with known
+limitations and code duplication.
+
+Introduce skb_flow_dissect() to factorize this, highly inspired from
+existing dissector from __skb_get_rxhash()
+
+Note : We extensively use skb_header_pointer(), this permits us to not
+touch skb at all.
+
+Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
+new file mode 100644
+index 0000000..e4cb285
+--- /dev/null
++++ b/include/net/flow_keys.h
+@@ -0,0 +1,15 @@
++#ifndef _NET_FLOW_KEYS_H
++#define _NET_FLOW_KEYS_H
++
++struct flow_keys {
++	__be32 src;
++	__be32 dst;
++	union {
++		__be32 ports;
++		__be16 port16[2];
++	};
++	u8 ip_proto;
++};
++
++extern bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow);
++#endif
+diff --git a/net/core/Makefile b/net/core/Makefile
+index 3606d40..c4ecc86 100644
+--- a/net/core/Makefile
++++ b/net/core/Makefile
+@@ -3,7 +3,7 @@
+ #
+ 
+ obj-y := sock.o request_sock.o skbuff.o iovec.o datagram.o stream.o scm.o \
+-	 gen_stats.o gen_estimator.o net_namespace.o secure_seq.o
++	 gen_stats.o gen_estimator.o net_namespace.o secure_seq.o flow_dissector.o
+ 
+ obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
+ 
+diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
+new file mode 100644
+index 0000000..f0516d9
+--- /dev/null
++++ b/net/core/flow_dissector.c
+@@ -0,0 +1,134 @@
++#include <linux/skbuff.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <linux/if_vlan.h>
++#include <net/ip.h>
++#include <linux/if_tunnel.h>
++#include <linux/if_pppox.h>
++#include <linux/ppp_defs.h>
++#include <net/flow_keys.h>
++
++
++bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
++{
++	int poff, nhoff = skb_network_offset(skb);
++	u8 ip_proto;
++	__be16 proto = skb->protocol;
++
++	memset(flow, 0, sizeof(*flow));
++
++again:
++	switch (proto) {
++	case __constant_htons(ETH_P_IP): {
++		const struct iphdr *iph;
++		struct iphdr _iph;
++ip:
++		iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
++		if (!iph)
++			return false;
++
++		if (ip_is_fragment(iph))
++			ip_proto = 0;
++		else
++			ip_proto = iph->protocol;
++		flow->src = iph->saddr;
++		flow->dst = iph->daddr;
++		nhoff += iph->ihl * 4;
++		break;
++	}
++	case __constant_htons(ETH_P_IPV6): {
++		const struct ipv6hdr *iph;
++		struct ipv6hdr _iph;
++ipv6:
++		iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
++		if (!iph)
++			return false;
++
++		ip_proto = iph->nexthdr;
++		flow->src = iph->saddr.s6_addr32[3];
++		flow->dst = iph->daddr.s6_addr32[3];
++		nhoff += sizeof(struct ipv6hdr);
++		break;
++	}
++	case __constant_htons(ETH_P_8021Q): {
++		const struct vlan_hdr *vlan;
++		struct vlan_hdr _vlan;
++
++		vlan = skb_header_pointer(skb, nhoff, sizeof(_vlan), &_vlan);
++		if (!vlan)
++			return false;
++
++		proto = vlan->h_vlan_encapsulated_proto;
++		nhoff += sizeof(*vlan);
++		goto again;
++	}
++	case __constant_htons(ETH_P_PPP_SES): {
++		struct {
++			struct pppoe_hdr hdr;
++			__be16 proto;
++		} *hdr, _hdr;
++		hdr = skb_header_pointer(skb, nhoff, sizeof(_hdr), &_hdr);
++		if (!hdr)
++			return false;
++		proto = hdr->proto;
++		nhoff += PPPOE_SES_HLEN;
++		switch (proto) {
++		case __constant_htons(PPP_IP):
++			goto ip;
++		case __constant_htons(PPP_IPV6):
++			goto ipv6;
++		default:
++			return false;
++		}
++	}
++	default:
++		return false;
++	}
++
++	switch (ip_proto) {
++	case IPPROTO_GRE: {
++		struct gre_hdr {
++			__be16 flags;
++			__be16 proto;
++		} *hdr, _hdr;
++
++		hdr = skb_header_pointer(skb, nhoff, sizeof(_hdr), &_hdr);
++		if (!hdr)
++			return false;
++		/*
++		 * Only look inside GRE if version zero and no
++		 * routing
++		 */
++		if (!(hdr->flags & (GRE_VERSION|GRE_ROUTING))) {
++			proto = hdr->proto;
++			nhoff += 4;
++			if (hdr->flags & GRE_CSUM)
++				nhoff += 4;
++			if (hdr->flags & GRE_KEY)
++				nhoff += 4;
++			if (hdr->flags & GRE_SEQ)
++				nhoff += 4;
++			goto again;
++		}
++		break;
++	}
++	case IPPROTO_IPIP:
++		goto again;
++	default:
++		break;
++	}
++
++	flow->ip_proto = ip_proto;
++	poff = proto_ports_offset(ip_proto);
++	if (poff >= 0) {
++		__be32 *ports, _ports;
++
++		nhoff += poff;
++		ports = skb_header_pointer(skb, nhoff, sizeof(_ports), &_ports);
++		if (ports)
++			flow->ports = *ports;
++	}
++
++	return true;
++}
++EXPORT_SYMBOL(skb_flow_dissect);
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch (from r19064, dists/sid/linux-2.6/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch)
@@ -0,0 +1,35 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 31 May 2012 02:58:44 +0100
+Subject: [PATCH] Revert "workqueue: skip nr_running sanity check in
+ worker_enter_idle() if trustee is active"
+
+This reverts commit 5d79c6f64a904afc92a329f80abe693e3ae105fe.
+It conflicts with, and appears to be unnecessary for, the PREEMPT_RT
+series.
+---
+ kernel/workqueue.c |    9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/kernel/workqueue.c b/kernel/workqueue.c
+index 7947e16..bb425b1 100644
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -1215,13 +1215,8 @@ static void worker_enter_idle(struct worker *worker)
+ 	} else
+ 		wake_up_all(&gcwq->trustee_wait);
+ 
+-	/*
+-	 * Sanity check nr_running.  Because trustee releases gcwq->lock
+-	 * between setting %WORKER_ROGUE and zapping nr_running, the
+-	 * warning may trigger spuriously.  Check iff trustee is idle.
+-	 */
+-	WARN_ON_ONCE(gcwq->trustee_state == TRUSTEE_DONE &&
+-		     gcwq->nr_workers == gcwq->nr_idle &&
++	/* sanity check nr_running */
++	WARN_ON_ONCE(gcwq->nr_workers == gcwq->nr_idle &&
+ 		     atomic_read(get_gcwq_nr_running(gcwq->cpu)));
+ }
+ 
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch (from r19064, dists/sid/linux-2.6/debian/patches/features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch)
@@ -0,0 +1,49 @@
+From: Andy Whitcroft <apw at canonical.com>
+Date: Fri, 4 May 2012 22:15:10 +0100
+Subject: [PATCH 78/79] libata: add a host flag to ignore detected ATA devices
+
+commit db63a4c8115a0bb904496e1cdd3e7488e68b0d06 upstream.
+
+Where devices are visible via more than one host we sometimes wish to
+indicate that cirtain devices should be ignored on a specific host.  Add a
+host flag indicating that this host wishes to ignore ATA specific devices.
+
+Signed-off-by: Andy Whitcroft <apw at canonical.com>
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
+---
+ drivers/ata/libata-core.c |    6 ++++++
+ include/linux/libata.h    |    1 +
+ 2 files changed, 7 insertions(+)
+
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
+index 23763a1..d31ee55 100644
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -1973,6 +1973,12 @@ retry:
+ 	if (class == ATA_DEV_ATA) {
+ 		if (!ata_id_is_ata(id) && !ata_id_is_cfa(id))
+ 			goto err_out;
++		if (ap->host->flags & ATA_HOST_IGNORE_ATA &&
++							ata_id_is_ata(id)) {
++			ata_dev_dbg(dev,
++				"host indicates ignore ATA devices, ignored\n");
++			return -ENOENT;
++		}
+ 	} else {
+ 		if (ata_id_is_ata(id))
+ 			goto err_out;
+diff --git a/include/linux/libata.h b/include/linux/libata.h
+index e926df7..6e887c7 100644
+--- a/include/linux/libata.h
++++ b/include/linux/libata.h
+@@ -247,6 +247,7 @@ enum {
+ 	ATA_HOST_SIMPLEX	= (1 << 0),	/* Host is simplex, one DMA channel per host only */
+ 	ATA_HOST_STARTED	= (1 << 1),	/* Host started */
+ 	ATA_HOST_PARALLEL_SCAN	= (1 << 2),	/* Ports on this host can be scanned in parallel */
++	ATA_HOST_IGNORE_ATA	= (1 << 3),	/* Ignore ATA devices on this host. */
+ 
+ 	/* bits 24:31 of host->flags are reserved for LLD specific flags */
+ 
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch (from r19064, dists/sid/linux-2.6/debian/patches/features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch	Fri Jun 29 01:05:07 2012	(r19228, copy of r19064, dists/sid/linux-2.6/debian/patches/features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch)
@@ -0,0 +1,82 @@
+From: Andy Whitcroft <apw at canonical.com>
+Date: Fri, 4 May 2012 22:15:11 +0100
+Subject: [PATCH 79/79] ata_piix: defer disks to the Hyper-V drivers by
+ default
+
+commit cd006086fa5d91414d8ff9ff2b78fbb593878e3c upstream.
+
+When we are hosted on a Microsoft Hyper-V hypervisor the guest disks
+are exposed both via the Hyper-V paravirtualised drivers and via an
+emulated SATA disk drive.  In this case we want to use the paravirtualised
+drivers if we can as they are much more efficient.  Note that the Hyper-V
+paravirtualised drivers only expose the virtual hard disk devices, the
+CDROM/DVD devices must still be enumerated.
+
+Mark the host controller ATA_HOST_IGNORE_ATA to prevent enumeration of
+disk devices.
+
+BugLink: http://bugs.launchpad.net/bugs/929545
+BugLink: http://bugs.launchpad.net/bugs/942316
+Signed-off-by: Andy Whitcroft <apw at canonical.com>
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
+---
+ drivers/ata/ata_piix.c |   36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
+index 7857e8f..3c809bf 100644
+--- a/drivers/ata/ata_piix.c
++++ b/drivers/ata/ata_piix.c
+@@ -1554,6 +1554,39 @@ static bool piix_broken_system_poweroff(struct pci_dev *pdev)
+ 	return false;
+ }
+ 
++static int prefer_ms_hyperv = 1;
++module_param(prefer_ms_hyperv, int, 0);
++
++static void piix_ignore_devices_quirk(struct ata_host *host)
++{
++#if IS_ENABLED(CONFIG_HYPERV_STORAGE)
++	static const struct dmi_system_id ignore_hyperv[] = {
++		{
++			/* On Hyper-V hypervisors the disks are exposed on
++			 * both the emulated SATA controller and on the
++			 * paravirtualised drivers.  The CD/DVD devices
++			 * are only exposed on the emulated controller.
++			 * Request we ignore ATA devices on this host.
++			 */
++			.ident = "Hyper-V Virtual Machine",
++			.matches = {
++				DMI_MATCH(DMI_SYS_VENDOR,
++						"Microsoft Corporation"),
++				DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"),
++			},
++		},
++		{ }	/* terminate list */
++	};
++	const struct dmi_system_id *dmi = dmi_first_match(ignore_hyperv);
++
++	if (dmi && prefer_ms_hyperv) {
++		host->flags |= ATA_HOST_IGNORE_ATA;
++		dev_info(host->dev, "%s detected, ATA device ignore set\n",
++			dmi->ident);
++	}
++#endif
++}
++
+ /**
+  *	piix_init_one - Register PIIX ATA PCI device with kernel services
+  *	@pdev: PCI device to register
+@@ -1669,6 +1702,9 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
+ 	}
+ 	host->flags |= ATA_HOST_PARALLEL_SCAN;
+ 
++	/* Allow hosts to specify device types to ignore when scanning. */
++	piix_ignore_devices_quirk(host);
++
+ 	pci_set_master(pdev);
+ 	return ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht);
+ }
+-- 
+1.7.10
+

Copied: dists/squeeze-backports/linux/debian/patches/series-all (from r19072, dists/sid/linux/debian/patches/series-all)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/series-all	Fri Jun 29 01:05:07 2012	(r19228, copy of r19072, dists/sid/linux/debian/patches/series-all)
@@ -0,0 +1,311 @@
++ debian/version.patch
++ debian/kernelvariables.patch
++ debian/doc-build-parallel.patch
+
++ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
+
++ features/all/sound-pci-cs46xx-request_firmware.patch
+
+# Patches and source files from aufs3 repository, imported with
+# debian/patches/features/all/aufs3/gen-patch.
++ features/all/aufs3/aufs3-base.patch
++ features/all/aufs3/aufs3-standalone.patch
++ features/all/aufs3/aufs3-kbuild.patch
++ features/all/aufs3/aufs3-add.patch
+# mark as staging/crap
++ features/all/aufs3/mark-as-staging.patch
+# fix added exports from security/device_cgroup.c
++ features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
+
++ bugfix/ia64/hardcode-arch-script-output.patch
++ bugfix/mips/disable-advansys.patch
++ bugfix/arm/disable-scsi_acard.patch
++ debian/mips-disable-werror.patch
++ bugfix/powerpc/lpar-console.patch
+
++ debian/sysrq-mask.patch
+
++ debian/arch-sh4-fix-uimage-build.patch
+
++ debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
++ debian/rds-Disable-auto-loading-as-mitigation-against-local.patch
++ debian/decnet-Disable-auto-loading-as-mitigation-against-lo.patch
+
++ bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
++ features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
+
++ debian/sched-autogroup-disabled.patch
+#+ bugfix/all/rt2800-disable-powersaving-as-default.patch
++ features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
++ debian/cgroups-Document-the-Debian-memory-resource-controll.patch
++ bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
++ features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
+
++ bugfix/arm/ixp4xx_iobe.patch
+
++ debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
+
++ bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch
+
++ features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
++ bugfix/all/cpu-Do-not-return-errors-from-cpu_dev_init-which-wil.patch
++ bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
++ debian/x86-memtest-WARN-if-bad-RAM-found.patch
++ bugfix/all/snapshot-Implement-compat_ioctl.patch
++ debian/ARM-Remove-use-of-possibly-undefined-BUILD_BUG_ON-in.patch
++ bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
++ bugfix/arm/ARM-topdown-mmap.patch
++ bugfix/alpha/alpha-add-io-read-write-16-32-be-functions.patch
++ features/arm/ARM-kirkwood-6282A1.patch
++ features/all/Input-ALPS-move-protocol-information-to-Documentatio.patch
++ features/all/Input-ALPS-add-protocol-version-field-in-alps_model_.patch
++ features/all/Input-ALPS-remove-assumptions-about-packet-size.patch
++ features/all/Input-ALPS-add-support-for-protocol-versions-3-and-4.patch
++ features/all/Input-ALPS-add-semi-MT-support-for-v3-protocol.patch
++ bugfix/x86/KVM-nVMX-Add-KVM_REQ_IMMEDIATE_EXIT.patch
++ bugfix/x86/KVM-nVMX-Fix-warning-causing-idt-vectoring-info-beha.patch
+
++ features/all/hwmon-it87-Add-IT8728F-support.patch
+
++ bugfix/x86/drm-i915-do-not-enable-RC6p-on-Sandy-Bridge.patch
++ bugfix/x86/drm-i915-fix-operator-precedence-when-enabling-RC6p.patch
+
++ features/all/fs-symlink-restrictions-on-sticky-directories.patch
++ features/all/fs-symlink-restrictions-on-sticky-directories-fix-2.patch
++ features/all/fs-hardlink-creation-restrictions.patch
++ features/all/fs-hardlink-creation-restrictions-fix.patch
++ features/all/fs-hardlink-creation-restriction-cleanup.patch
++ bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
+
+# Temporary, until the original change has been tested some more
++ debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch
+
+# Update all Hyper-V drivers to 3.4-rc1 (no longer staging)
++ features/x86/hyperv/0001-NLS-improve-UTF8-UTF16-string-conversion-routine.patch
++ features/x86/hyperv/0002-HID-Move-the-hid-hyperv-driver-out-of-staging.patch
++ features/x86/hyperv/0003-Staging-hv-storvsc-Use-mempools-to-allocate-struct-s.patch
++ features/x86/hyperv/0004-Staging-hv-storvsc-Cleanup-error-handling-in-the-pro.patch
++ features/x86/hyperv/0005-Staging-hv-storvsc-Fixup-the-error-when-processing-S.patch
++ features/x86/hyperv/0006-Staging-hv-storvsc-Fix-error-handling-storvsc_host_r.patch
++ features/x86/hyperv/0007-Staging-hv-storvsc-Use-the-accessor-function-shost_p.patch
++ features/x86/hyperv/0008-Staging-hv-storvsc-Use-the-unlocked-version-queuecom.patch
++ features/x86/hyperv/0009-Staging-hv-storvsc-use-the-macro-KBUILD_MODNAME.patch
++ features/x86/hyperv/0010-Staging-hv-storvsc-Get-rid-of-an-unnecessary-forward.patch
++ features/x86/hyperv/0011-Staging-hv-storvsc-Upgrade-the-vmstor-protocol-versi.patch
++ features/x86/hyperv/0012-Staging-hv-storvsc-Support-hot-add-of-scsi-disks.patch
++ features/x86/hyperv/0013-Staging-hv-storvsc-Support-hot-removing-of-scsi-devi.patch
++ features/x86/hyperv/0014-staging-hv-Use-kmemdup-rather-than-duplicating-its-i.patch
++ features/x86/hyperv/0015-Staging-hv-vmbus-Support-building-the-vmbus-driver-a.patch
++ features/x86/hyperv/0016-hv-Add-Kconfig-menu-entry.patch
++ features/x86/hyperv/0017-Staging-hv-mousevsc-Remove-the-mouse-driver-from-the.patch
++ features/x86/hyperv/0018-staging-hv-move-hv_netvsc-out-of-staging-area.patch
++ features/x86/hyperv/0019-net-hyperv-Fix-long-lines-in-netvsc.c.patch
++ features/x86/hyperv/0020-net-hyperv-Add-support-for-promiscuous-mode-setting.patch
++ features/x86/hyperv/0021-Staging-hv-storvsc-Disable-clustering.patch
++ features/x86/hyperv/0022-Staging-hv-storvsc-Cleanup-storvsc_device_alloc.patch
++ features/x86/hyperv/0023-Staging-hv-storvsc-Fix-a-bug-in-storvsc_command_comp.patch
++ features/x86/hyperv/0024-Staging-hv-storvsc-Fix-a-bug-in-copy_from_bounce_buf.patch
++ features/x86/hyperv/0025-Staging-hv-storvsc-Implement-per-device-memory-pools.patch
++ features/x86/hyperv/0026-Staging-hv-update-TODO-file.patch
++ features/x86/hyperv/0027-HID-hv_mouse-Properly-add-the-hid-device.patch
++ features/x86/hyperv/0028-Staging-hv-storvsc-Fix-a-bug-in-create_bounce_buffer.patch
++ features/x86/hyperv/0029-net-hyperv-Fix-the-stop-wake-queue-mechanism.patch
++ features/x86/hyperv/0030-Drivers-hv-Fix-a-memory-leak.patch
++ features/x86/hyperv/0031-Drivers-hv-Make-the-vmbus-driver-unloadable.patch
++ features/x86/hyperv/0032-Drivers-hv-Get-rid-of-an-unnecessary-check-in-hv.c.patch
++ features/x86/hyperv/0033-net-hyperv-Remove-unnecessary-kmap_atomic-in-netvsc-.patch
++ features/x86/hyperv/0034-net-hyperv-Add-NETVSP-protocol-version-negotiation.patch
++ features/x86/hyperv/0035-net-hyperv-Add-support-for-jumbo-frame-up-to-64KB.patch
++ features/x86/hyperv/0036-net-hyperv-fix-possible-memory-leak-in-do_set_multic.patch
++ features/x86/hyperv/0037-drivers-hv-Get-rid-of-some-unnecessary-code.patch
++ features/x86/hyperv/0038-net-hyperv-rx_bytes-should-account-the-ether-header-.patch
++ features/x86/hyperv/0039-HID-hyperv-Properly-disconnect-the-input-device.patch
++ features/x86/hyperv/0040-net-hyperv-fix-the-issue-that-large-packets-be-dropp.patch
++ features/x86/hyperv/0041-net-hyperv-Use-netif_tx_disable-instead-of-netif_sto.patch
++ features/x86/hyperv/0042-net-hyperv-Fix-the-page-buffer-when-an-RNDIS-message.patch
++ features/x86/hyperv/0043-drivers-hv-kvp-Add-cleanup-connector-defines.patch
++ features/x86/hyperv/0044-drivers-hv-kvp-Move-the-contents-of-hv_kvp.h-to-hype.patch
++ features/x86/hyperv/0045-net-hyperv-Convert-camel-cased-variables-in-rndis_fi.patch
++ features/x86/hyperv/0046-net-hyperv-Correct-the-assignment-in-netvsc_recv_cal.patch
++ features/x86/hyperv/0047-net-hyperv-Remove-the-unnecessary-memset-in-rndis_fi.patch
++ features/x86/hyperv/0048-Staging-hv-storvsc-Cleanup-some-comments.patch
++ features/x86/hyperv/0049-Staging-hv-storvsc-Cleanup-storvsc_probe.patch
++ features/x86/hyperv/0050-Staging-hv-storvsc-Cleanup-storvsc_queuecommand.patch
++ features/x86/hyperv/0051-Staging-hv-storvsc-Introduce-defines-for-srb-status-.patch
++ features/x86/hyperv/0052-Staging-hv-storvsc-Cleanup-storvsc_host_reset_handle.patch
++ features/x86/hyperv/0053-Staging-hv-storvsc-Move-and-cleanup-storvsc_remove.patch
++ features/x86/hyperv/0054-Staging-hv-storvsc-Add-a-comment-to-explain-life-cyc.patch
++ features/x86/hyperv/0055-Staging-hv-storvsc-Get-rid-of-the-on_io_completion-i.patch
++ features/x86/hyperv/0056-Staging-hv-storvsc-Rename-the-context-field-in-hv_st.patch
++ features/x86/hyperv/0057-Staging-hv-storvsc-Miscellaneous-cleanup-of-storvsc-.patch
++ features/x86/hyperv/0058-Staging-hv-storvsc-Cleanup-the-code-for-generating-p.patch
++ features/x86/hyperv/0059-Staging-hv-storvsc-Cleanup-some-protocol-related-con.patch
++ features/x86/hyperv/0060-Staging-hv-storvsc-Get-rid-of-some-unused-defines.patch
++ features/x86/hyperv/0061-Staging-hv-storvsc-Consolidate-the-request-structure.patch
++ features/x86/hyperv/0062-Staging-hv-storvsc-Consolidate-all-the-wire-protocol.patch
++ features/x86/hyperv/0063-drivers-hv-Cleanup-the-kvp-related-state-in-hyperv.h.patch
++ features/x86/hyperv/0064-tools-hv-Use-hyperv.h-to-get-the-KVP-definitions.patch
++ features/x86/hyperv/0065-drivers-hv-kvp-Cleanup-the-kernel-user-protocol.patch
++ features/x86/hyperv/0066-drivers-hv-Increase-the-number-of-VCPUs-supported-in.patch
++ features/x86/hyperv/0067-Staging-hv-storvsc-Move-the-storage-driver-out-of-th.patch
++ features/x86/hyperv/0068-net-hyperv-Use-the-built-in-macro-KBUILD_MODNAME-for.patch
++ features/x86/hyperv/0069-net-hyperv-Fix-data-corruption-in-rndis_filter_recei.patch
++ features/x86/hyperv/0070-net-hyperv-Add-support-for-vlan-trunking-from-guests.patch
++ features/x86/hyperv/0071-Drivers-hv-Add-new-message-types-to-enhance-KVP.patch
++ features/x86/hyperv/0072-net-hyperv-fix-erroneous-NETDEV_TX_BUSY-use.patch
++ features/x86/hyperv/0073-Drivers-hv-Support-the-newly-introduced-KVP-messages.patch
++ features/x86/hyperv/0074-Tools-hv-Fully-support-the-new-KVP-verbs-in-the-user.patch
++ features/x86/hyperv/0075-Tools-hv-Support-enumeration-from-all-the-pools.patch
++ features/x86/hyperv/0076-net-hyperv-Fix-the-code-handling-tx-busy.patch
++ features/x86/hyperv/0077-hv-remove-the-second-argument-of-k-un-map_atomic.patch
++ features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch
++ features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch
+
++ features/x86/efi-stub/0001-x86-Add-missing-bzImage-fields-to-struct-setup_heade.patch
++ features/x86/efi-stub/0002-x86-Don-t-use-magic-strings-for-EFI-loader-signature.patch
++ features/x86/efi-stub/0003-efi.h-Add-struct-definition-for-boot-time-services.patch
++ features/x86/efi-stub/0004-efi.h-Add-efi_image_loaded_t.patch
++ features/x86/efi-stub/0005-efi.h-Add-allocation-types-for-boottime-allocate_pag.patch
++ features/x86/efi-stub/0006-efi.h-Add-graphics-protocol-guids.patch
++ features/x86/efi-stub/0007-efi.h-Add-boottime-locate_handle-search-types.patch
++ features/x86/efi-stub/0008-efi-Add-EFI-file-I-O-data-types.patch
++ features/x86/efi-stub/0009-x86-efi-EFI-boot-stub-support.patch
++ features/x86/efi-stub/0010-x86-efi-Break-up-large-initrd-reads.patch
++ features/x86/efi-stub/0011-x86-efi-Fix-pointer-math-issue-in-handle_ramdisks.patch
++ features/x86/efi-stub/0012-tools-include-Add-byteshift-headers-for-endian-acces.patch
++ features/x86/efi-stub/0013-x86-mkpiggy-Don-t-open-code-put_unaligned_le32.patch
++ features/x86/efi-stub/0014-x86-boot-Restrict-CFLAGS-for-hostprogs.patch
++ features/x86/efi-stub/0015-x86-efi-Fix-endian-issues-and-unaligned-accesses.patch
++ features/x86/efi-stub/0016-x86-boot-Correct-CFLAGS-for-hostprogs.patch
++ features/x86/efi-stub/0017-x86-efi-Add-dedicated-EFI-stub-entry-point.patch
+
++ bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch
++ bugfix/all/NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
+
+# Temporary, until the next ABI bump
++ debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch
++ debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch
++ debian/efi-avoid-ABI-change.patch
++ debian/skbuff-avoid-ABI-change-in-3.2.17.patch
++ debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch
++ debian/fork-avoid-ABI-change-in-3.2.18.patch
++ debian/mmc-Avoid-ABI-change-in-3.2.19.patch
+
++ bugfix/all/ext4-Report-max_batch_time-option-correctly.patch
+
+# Update wacom driver to 3.5ish
++ features/all/wacom/0001-Input-wacom-cleanup-feature-report-for-bamboos.patch
++ features/all/wacom/0002-Input-wacom-remove-unused-bamboo-HID-parsing.patch
++ features/all/wacom/0003-Input-wacom-add-some-comments-to-wacom_parse_hid.patch
++ features/all/wacom/0005-Input-wacom-read-3rd-gen-Bamboo-Touch-HID-data.patch
++ features/all/wacom/0006-Input-wacom-3rd-gen-Bamboo-P-Touch-packet-support.patch
++ features/all/wacom/0007-Input-wacom-ignore-unwanted-bamboo-packets.patch
++ features/all/wacom/0008-Input-wacom-add-support-for-Cintiq-24HD.patch
++ features/all/wacom/0009-Input-wacom-add-LED-support-for-Cintiq-24HD.patch
++ features/all/wacom/0010-Input-wacom-use-BTN_TOOL_FINGER-to-indicate-touch-de.patch
++ features/all/wacom/0011-Input-wacom-use-switch-statement-for-wacom_tpc_irq.patch
++ features/all/wacom/0012-Input-wacom-add-missing-LEDS_CLASS-to-Kconfig.patch
++ features/all/wacom/0013-Input-wacom-fix-3rd-gen-Bamboo-MT-when-4-fingers-are.patch
++ features/all/wacom/0014-Input-wacom-fix-physical-size-calculation-for-3rd-ge.patch
++ features/all/wacom/0015-Input-wacom-isolate-input-registration.patch
++ features/all/wacom/0016-Input-wacom-check-for-allocation-failure-in-probe.patch
++ features/all/wacom/0017-Input-wacom-wireless-monitor-framework.patch
++ features/all/wacom/0018-Input-wacom-create-inputs-when-wireless-connect.patch
++ features/all/wacom/0019-Input-wacom-wireless-battery-status.patch
++ features/all/wacom/0020-Input-wacom-add-basic-Intuos5-support.patch
++ features/all/wacom/0021-Input-wacom-add-Intuos5-Touch-Ring-ExpressKey-suppor.patch
++ features/all/wacom/0022-Input-wacom-add-Intuos5-Touch-Ring-LED-support.patch
++ features/all/wacom/0023-Input-wacom-add-Intuos5-multitouch-sensor-support.patch
++ features/all/wacom/0024-Input-wacom-retrieve-maximum-number-of-touch-points.patch
++ features/all/wacom/0025-Input-wacom-add-0xE5-MT-device-support.patch
++ features/all/wacom/0026-Input-wacom-return-proper-error-if-usb_get_extra_des.patch
+
+# Add support for Ralink RT5392/RF5372 chipset
++ features/all/rt2x00-add-debug-message-for-new-chipset.patch
++ features/all/rt2x00-add-rt5372-chipset-support.patch
+
++ bugfix/all/acpi-battery-only-refresh-the-sysfs-files-when-pertinent.patch
+
+# Update be2net driver to 3.5ish
++ features/all/be2net/0001-sweep-the-floors-and-convert-some-.get_drvinfo-routi.patch
++ features/all/be2net/0002-be2net-init-vf-_if_handle-vf_pmac_id-to-handle-failu.patch
++ features/all/be2net/0003-be2net-stop-checking-the-UE-registers-after-an-EEH-e.patch
++ features/all/be2net/0004-be2net-don-t-log-more-than-one-error-on-detecting-EE.patch
++ features/all/be2net/0005-be2net-stop-issuing-FW-cmds-if-any-cmd-times-out.patch
++ features/all/be2net/0006-be2net-Fix-TX-queue-create-for-Lancer.patch
++ features/all/be2net/0007-be2net-add-register-dump-feature-for-Lancer.patch
++ features/all/be2net/0008-be2net-Add-EEPROM-dump-feature-for-Lancer.patch
++ features/all/be2net/0009-be2net-Fix-VLAN-promiscous-mode-for-Lancer.patch
++ features/all/be2net/0010-be2net-Use-V1-query-link-status-command-for-lancer.patch
++ features/all/be2net/0011-be2net-Move-to-new-SR-IOV-implementation-in-Lancer.patch
++ features/all/be2net/0012-be2net-Fix-error-recovery-paths.patch
++ features/all/be2net/0013-be2net-Add-error-handling-for-Lancer.patch
++ features/all/be2net/0014-be2net-Use-new-hash-key.patch
++ features/all/be2net/0015-be2net-Fix-non-utilization-of-RX-queues.patch
++ features/all/be2net/0016-be2net-netpoll-support.patch
++ features/all/be2net/0017-be2net-update-some-counters-to-display-via-ethtool.patch
++ features/all/be2net/0018-be2net-workaround-to-fix-a-bug-in-BE.patch
++ features/all/be2net/0019-be2net-fix-ethtool-ringparam-reporting.patch
++ features/all/be2net/0020-be2net-refactor-cleanup-vf-configuration-code.patch
++ features/all/be2net/0021-be2net-Add-support-for-Skyhawk-cards.patch
++ features/all/be2net/0022-be2net-Fix-INTx-processing-for-Lancer.patch
++ features/all/be2net/0023-be2net-fix-be_vlan_add-rem_vid.patch
++ features/all/be2net/0024-be2net-fix-range-check-for-set_qos-for-a-VF.patch
++ features/all/be2net/0025-be2net-query-link-status-in-be_open.patch
++ features/all/be2net/0026-netdev-make-net_device_ops-const.patch
++ features/all/be2net/0027-be2net-create-RSS-rings-even-in-multi-channel-config.patch
++ features/all/be2net/0028-be2net-allocate-more-headroom-in-incoming-skbs.patch
++ features/all/be2net/0029-be2net-add-descriptions-for-stat-counters-reported-v.patch
++ features/all/be2net/0030-be2net-Fix-link-status-query-command.patch
++ features/all/be2net/0031-be2net-Use-new-implementation-of-get-mac-list-comman.patch
++ features/all/be2net/0032-be2net-event-queue-re-design.patch
++ features/all/be2net/0033-be2net-cancel-be_worker-during-EEH-recovery.patch
++ features/all/be2net/0034-be2net-fix-tx-completion-cleanup.patch
++ features/all/be2net/0035-be2net-reset-queue-address-after-freeing.patch
++ features/all/be2net/0036-be2net-enable-RSS-for-ipv6-pkts.patch
++ features/all/be2net/0037-be2net-update-driver-version.patch
++ features/all/be2net/0038-be2net-Remove-unused-OFFSET_IN_PAGE-macro.patch
++ features/all/be2net/0039-be2net-enable-WOL-by-default-if-h-w-supports-it.patch
++ features/all/be2net/0040-be2net-Program-secondary-UC-MAC-address-into-MAC-fil.patch
++ features/all/be2net/0041-be2net-Fix-number-of-vlan-slots-in-flex-mode.patch
++ features/all/be2net/0042-be2net-fix-programming-of-VLAN-tags-for-VF.patch
++ features/all/be2net/0043-be2net-fix-ethtool-get-settings.patch
++ features/all/be2net/0044-be2net-Fix-VLAN-multicast-packet-reception.patch
++ features/all/be2net/0045-be2net-Fix-FW-download-in-Lancer.patch
++ features/all/be2net/0046-be2net-Fix-ethtool-self-test-for-Lancer.patch
++ features/all/be2net/0047-be2net-Fix-traffic-stall-INTx-mode.patch
++ features/all/be2net/0048-be2net-Fix-Lancer-statistics.patch
++ features/all/be2net/0049-be2net-Fix-wrong-status-getting-returned-for-MCC-com.patch
++ features/all/be2net/0050-be2net-Fix-FW-download-for-BE.patch
++ features/all/be2net/0051-be2net-Ignore-status-of-some-ioctls-during-driver-lo.patch
++ features/all/be2net/0052-be2net-fix-speed-displayed-by-ethtool-on-certain-SKU.patch
++ features/all/be2net/0053-be2net-update-the-driver-version.patch
++ features/all/be2net/0054-be2net-Fix-to-not-set-link-speed-for-disabled-functi.patch
++ features/all/be2net/0055-be2net-Fix-to-apply-duplex-value-as-unknown-when-lin.patch
++ features/all/be2net/0056-be2net-Record-receive-queue-index-in-skb-to-aid-RPS.patch
++ features/all/be2net/0057-be2net-Fix-EEH-error-reset-before-a-flash-dump-compl.patch
++ features/all/be2net/0058-be2net-avoid-disabling-sriov-while-VFs-are-assigned.patch
+
+# Add CoDel from 3.5, and prerequisites
++ features/all/net-introduce-skb_flow_dissect.patch
++ features/all/flow_dissector-use-a-64bit-load-store.patch
++ features/all/net-flow_dissector.c-missing-include-linux-export.h.patch
++ features/all/codel/0001-codel-Controlled-Delay-AQM.patch
++ features/all/codel/0002-codel-use-Newton-method-instead-of-sqrt-and-divides.patch
++ features/all/codel/0003-fq_codel-Fair-Queue-Codel-AQM.patch
++ features/all/codel/0004-net-codel-Add-missing-include-linux-prefetch.h.patch
++ features/all/codel/0005-net-codel-fix-build-errors.patch
++ features/all/codel/0006-codel-use-u16-field-instead-of-31bits-for-rec_inv_sq.patch
++ features/all/codel/0007-fq_codel-should-use-qdisc-backlog-as-threshold.patch
+
++ bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch
+
+# AppArmor userland compatibility.  This had better be gone in wheezy+1!
++ features/all/AppArmor-compatibility-patch-for-v5-interface.patch
+
++ bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch
++ bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
++ bugfix/all/mm-fix-vma_resv_map-null-pointer.patch
++ bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch
+
++ bugfix/all/fix-scsi_wait_scan.patch

Copied: dists/squeeze-backports/linux/debian/patches/series-none (from r19072, dists/sid/linux/debian/patches/series-none)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/series-none	Fri Jun 29 01:05:07 2012	(r19228, copy of r19072, dists/sid/linux/debian/patches/series-none)
@@ -0,0 +1 @@
+# dummy file

Copied: dists/squeeze-backports/linux/debian/patches/series-orig (from r19072, dists/sid/linux/debian/patches/series-orig)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/series-orig	Fri Jun 29 01:05:07 2012	(r19228, copy of r19072, dists/sid/linux/debian/patches/series-orig)
@@ -0,0 +1,10 @@
++ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
++ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
++ debian/dfsg/drivers-net-appletalk-cops.patch
++ debian/dfsg/drivers-staging-wlags49_h2-disable.patch
++ debian/dfsg/drivers-staging-wlags49_h25-disable.patch
++ debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
++ debian/dfsg/r8192e-remove-firmware-again.patch
++ debian/dfsg/firmware-cleanup.patch
++ debian/dfsg/sound-pci.patch
+X debian/dfsg/files-1

Copied: dists/squeeze-backports/linux/debian/patches/series-rt (from r19072, dists/sid/linux/debian/patches/series-rt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/series-rt	Fri Jun 29 01:05:07 2012	(r19228, copy of r19072, dists/sid/linux/debian/patches/series-rt)
@@ -0,0 +1,266 @@
++ features/all/rt/0001-x86-Call-idle-notifier-after-irq_enter.patch
++ features/all/rt/0002-slab-lockdep-Annotate-all-slab-caches.patch
++ features/all/rt/0003-x86-kprobes-Remove-remove-bogus-preempt_enable.patch
++ features/all/rt/0004-x86-hpet-Disable-MSI-on-Lenovo-W510.patch
++ features/all/rt/0005-block-Shorten-interrupt-disabled-regions.patch
++ features/all/rt/0006-sched-Distangle-worker-accounting-from-rq-3Elock.patch
++ features/all/rt/0007-mips-enable-interrupts-in-signal.patch.patch
++ features/all/rt/0008-arm-enable-interrupts-in-signal-code.patch.patch
++ features/all/rt/0009-powerpc-85xx-Mark-cascade-irq-IRQF_NO_THREAD.patch
++ features/all/rt/0010-powerpc-wsp-Mark-opb-cascade-handler-IRQF_NO_THREAD.patch
++ features/all/rt/0011-powerpc-Mark-IPI-interrupts-IRQF_NO_THREAD.patch
++ features/all/rt/0012-powerpc-Allow-irq-threading.patch
++ features/all/rt/0013-sched-Keep-period-timer-ticking-when-throttling-acti.patch
++ features/all/rt/0014-sched-Do-not-throttle-due-to-PI-boosting.patch
++ features/all/rt/0015-time-Remove-bogus-comments.patch
++ features/all/rt/0016-x86-vdso-Remove-bogus-locking-in-update_vsyscall_tz.patch
++ features/all/rt/0017-x86-vdso-Use-seqcount-instead-of-seqlock.patch
++ features/all/rt/0018-ia64-vsyscall-Use-seqcount-instead-of-seqlock.patch
++ features/all/rt/0019-seqlock-Remove-unused-functions.patch
++ features/all/rt/0020-seqlock-Use-seqcount.patch
++ features/all/rt/0021-vfs-fs_struct-Move-code-out-of-seqcount-write-sectio.patch
++ features/all/rt/0022-timekeeping-Split-xtime_lock.patch
++ features/all/rt/0023-intel_idle-Convert-i7300_idle_lock-to-raw-spinlock.patch
++ features/all/rt/0024-mm-memcg-shorten-preempt-disabled-section-around-eve.patch
++ features/all/rt/0025-tracing-Account-for-preempt-off-in-preempt_schedule.patch
++ features/all/rt/0026-signal-revert-ptrace-preempt-magic.patch.patch
++ features/all/rt/0027-arm-Mark-pmu-interupt-IRQF_NO_THREAD.patch
++ features/all/rt/0028-arm-Allow-forced-irq-threading.patch
++ features/all/rt/0029-preempt-rt-Convert-arm-boot_lock-to-raw.patch
++ features/all/rt/0030-sched-Create-schedule_preempt_disabled.patch
++ features/all/rt/0031-sched-Use-schedule_preempt_disabled.patch
++ features/all/rt/0032-signals-Do-not-wakeup-self.patch
++ features/all/rt/0033-posix-timers-Prevent-broadcast-signals.patch
++ features/all/rt/0034-signals-Allow-rt-tasks-to-cache-one-sigqueue-struct.patch
++ features/all/rt/0035-signal-x86-Delay-calling-signals-in-atomic.patch
++ features/all/rt/0036-generic-Use-raw-local-irq-variant-for-generic-cmpxch.patch
++ features/all/rt/0037-drivers-random-Reduce-preempt-disabled-region.patch
++ features/all/rt/0038-ARM-AT91-PIT-Remove-irq-handler-when-clock-event-is-.patch
++ features/all/rt/0039-clocksource-TCLIB-Allow-higher-clock-rates-for-clock.patch
++ features/all/rt/0040-drivers-net-tulip_remove_one-needs-to-call-pci_disab.patch
++ features/all/rt/0041-drivers-net-Use-disable_irq_nosync-in-8139too.patch
++ features/all/rt/0042-drivers-net-ehea-Make-rx-irq-handler-non-threaded-IR.patch
++ features/all/rt/0043-drivers-net-at91_ether-Make-mdio-protection-rt-safe.patch
++ features/all/rt/0044-preempt-mark-legitimated-no-resched-sites.patch.patch
++ features/all/rt/0045-mm-Prepare-decoupling-the-page-fault-disabling-logic.patch
++ features/all/rt/0046-mm-Fixup-all-fault-handlers-to-check-current-pagefau.patch
++ features/all/rt/0047-mm-pagefault_disabled.patch
++ features/all/rt/0048-mm-raw_pagefault_disable.patch
++ features/all/rt/0049-filemap-fix-up.patch.patch
++ features/all/rt/0050-mm-Remove-preempt-count-from-pagefault-disable-enabl.patch
++ features/all/rt/0051-x86-highmem-Replace-BUG_ON-by-WARN_ON.patch
++ features/all/rt/0052-suspend-Prevent-might-sleep-splats.patch
++ features/all/rt/0053-OF-Fixup-resursive-locking-code-paths.patch
++ features/all/rt/0054-of-convert-devtree-lock.patch.patch
++ features/all/rt/0055-list-add-list-last-entry.patch.patch
++ features/all/rt/0056-mm-page-alloc-use-list-last-entry.patch.patch
++ features/all/rt/0057-mm-slab-move-debug-out.patch.patch
++ features/all/rt/0058-rwsem-inlcude-fix.patch.patch
++ features/all/rt/0059-sysctl-include-fix.patch.patch
++ features/all/rt/0060-net-flip-lock-dep-thingy.patch.patch
++ features/all/rt/0061-softirq-thread-do-softirq.patch.patch
++ features/all/rt/0062-softirq-split-out-code.patch.patch
++ features/all/rt/0063-x86-Do-not-unmask-io_apic-when-interrupt-is-in-progr.patch
++ features/all/rt/0064-x86-32-fix-signal-crap.patch.patch
++ features/all/rt/0065-x86-Do-not-disable-preemption-in-int3-on-32bit.patch
++ features/all/rt/0066-rcu-Reduce-lock-section.patch
++ features/all/rt/0067-locking-various-init-fixes.patch.patch
++ features/all/rt/0068-wait-Provide-__wake_up_all_locked.patch
++ features/all/rt/0069-pci-Use-__wake_up_all_locked-pci_unblock_user_cfg_ac.patch
++ features/all/rt/0070-latency-hist.patch.patch
++ features/all/rt/0071-hwlatdetect.patch.patch
++ features/all/rt/0073-early-printk-consolidate.patch.patch
++ features/all/rt/0074-printk-kill.patch.patch
++ features/all/rt/0075-printk-force_early_printk-boot-param-to-help-with-de.patch
++ features/all/rt/0076-rt-preempt-base-config.patch.patch
++ features/all/rt/0077-bug-BUG_ON-WARN_ON-variants-dependend-on-RT-RT.patch
++ features/all/rt/0078-rt-local_irq_-variants-depending-on-RT-RT.patch
++ features/all/rt/0079-preempt-Provide-preempt_-_-no-rt-variants.patch
++ features/all/rt/0080-ata-Do-not-disable-interrupts-in-ide-code-for-preemp.patch
++ features/all/rt/0081-ide-Do-not-disable-interrupts-for-PREEMPT-RT.patch
++ features/all/rt/0082-infiniband-Mellanox-IB-driver-patch-use-_nort-primit.patch
++ features/all/rt/0083-input-gameport-Do-not-disable-interrupts-on-PREEMPT_.patch
++ features/all/rt/0084-acpi-Do-not-disable-interrupts-on-PREEMPT_RT.patch
++ features/all/rt/0085-core-Do-not-disable-interrupts-on-RT-in-kernel-users.patch
++ features/all/rt/0086-core-Do-not-disable-interrupts-on-RT-in-res_counter..patch
++ features/all/rt/0087-usb-Use-local_irq_-_nort-variants.patch
++ features/all/rt/0088-tty-Do-not-disable-interrupts-in-put_ldisc-on-rt.patch
++ features/all/rt/0089-mm-scatterlist-dont-disable-irqs-on-RT.patch
++ features/all/rt/0090-signal-fix-up-rcu-wreckage.patch.patch
++ features/all/rt/0091-net-wireless-warn-nort.patch.patch
++ features/all/rt/0092-mm-Replace-cgroup_page-bit-spinlock.patch
++ features/all/rt/0093-buffer_head-Replace-bh_uptodate_lock-for-rt.patch
++ features/all/rt/0094-fs-jbd-jbd2-Make-state-lock-and-journal-head-lock-rt.patch
++ features/all/rt/0095-genirq-Disable-DEBUG_SHIRQ-for-rt.patch
++ features/all/rt/0096-genirq-Disable-random-call-on-preempt-rt.patch
++ features/all/rt/0097-genirq-disable-irqpoll-on-rt.patch
++ features/all/rt/0098-genirq-force-threading.patch.patch
++ features/all/rt/0099-drivers-net-fix-livelock-issues.patch
++ features/all/rt/0100-drivers-net-vortex-fix-locking-issues.patch
++ features/all/rt/0101-drivers-net-gianfar-Make-RT-aware.patch
++ features/all/rt/0102-USB-Fix-the-mouse-problem-when-copying-large-amounts.patch
++ features/all/rt/0103-local-var.patch.patch
++ features/all/rt/0104-rt-local-irq-lock.patch.patch
++ features/all/rt/0105-cpu-rt-variants.patch.patch
++ features/all/rt/0106-mm-slab-wrap-functions.patch.patch
++ features/all/rt/0107-slab-Fix-__do_drain-to-use-the-right-array-cache.patch
++ features/all/rt/0108-mm-More-lock-breaks-in-slab.c.patch
++ features/all/rt/0109-mm-page_alloc-rt-friendly-per-cpu-pages.patch
++ features/all/rt/0110-mm-page_alloc-reduce-lock-sections-further.patch
++ features/all/rt/0111-mm-page-alloc-fix.patch.patch
++ features/all/rt/0112-mm-convert-swap-to-percpu-locked.patch
++ features/all/rt/0113-mm-vmstat-fix-the-irq-lock-asymetry.patch.patch
++ features/all/rt/0114-mm-make-vmstat-rt-aware.patch
++ features/all/rt/0115-mm-shrink-the-page-frame-to-rt-size.patch
++ features/all/rt/0116-ARM-Initialize-ptl-lock-for-vector-page.patch
++ features/all/rt/0117-mm-Allow-only-slab-on-RT.patch
++ features/all/rt/0118-radix-tree-rt-aware.patch.patch
++ features/all/rt/0119-panic-disable-random-on-rt.patch
++ features/all/rt/0120-ipc-Make-the-ipc-code-rt-aware.patch
++ features/all/rt/0121-ipc-mqueue-Add-a-critical-section-to-avoid-a-deadloc.patch
++ features/all/rt/0122-relay-fix-timer-madness.patch
++ features/all/rt/0123-net-ipv4-route-use-locks-on-up-rt.patch.patch
++ features/all/rt/0124-workqueue-avoid-the-lock-in-cpu-dying.patch.patch
++ features/all/rt/0125-timers-prepare-for-full-preemption.patch
++ features/all/rt/0126-timers-preempt-rt-support.patch
++ features/all/rt/0127-timers-fix-timer-hotplug-on-rt.patch
++ features/all/rt/0128-timers-mov-printk_tick-to-soft-interrupt.patch
++ features/all/rt/0129-timer-delay-waking-softirqs-from-the-jiffy-tick.patch
++ features/all/rt/0130-timers-Avoid-the-switch-timers-base-set-to-NULL-tric.patch
++ features/all/rt/0131-printk-Don-t-call-printk_tick-in-printk_needs_cpu-on.patch
++ features/all/rt/0132-hrtimers-prepare-full-preemption.patch
++ features/all/rt/0133-hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch
++ features/all/rt/0134-hrtimer-Don-t-call-the-timer-handler-from-hrtimer_st.patch
++ features/all/rt/0135-hrtimer-Add-missing-debug_activate-aid-Was-Re-ANNOUN.patch
++ features/all/rt/0136-hrtimer-fix-reprogram-madness.patch.patch
++ features/all/rt/0137-timer-fd-Prevent-live-lock.patch
++ features/all/rt/0138-posix-timers-thread-posix-cpu-timers-on-rt.patch
++ features/all/rt/0139-posix-timers-Shorten-posix_cpu_timers-CPU-kernel-thr.patch
++ features/all/rt/0140-posix-timers-Avoid-wakeups-when-no-timers-are-active.patch
++ features/all/rt/0141-sched-delay-put-task.patch.patch
++ features/all/rt/0142-sched-limit-nr-migrate.patch.patch
++ features/all/rt/0143-sched-mmdrop-delayed.patch.patch
++ features/all/rt/0144-sched-rt-mutex-wakeup.patch.patch
++ features/all/rt/0145-sched-prevent-idle-boost.patch.patch
++ features/all/rt/0146-sched-might-sleep-do-not-account-rcu-depth.patch.patch
++ features/all/rt/0147-sched-Break-out-from-load_balancing-on-rq_lock-conte.patch
++ features/all/rt/0148-sched-cond-resched.patch.patch
++ features/all/rt/0149-cond-resched-softirq-fix.patch.patch
++ features/all/rt/0150-sched-no-work-when-pi-blocked.patch.patch
++ features/all/rt/0151-cond-resched-lock-rt-tweak.patch.patch
++ features/all/rt/0152-sched-disable-ttwu-queue.patch.patch
++ features/all/rt/0153-sched-Disable-CONFIG_RT_GROUP_SCHED-on-RT.patch
++ features/all/rt/0154-sched-ttwu-Return-success-when-only-changing-the-sav.patch
++ features/all/rt/0155-stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch
++ features/all/rt/0156-stomp-machine-mark-stomper-thread.patch.patch
++ features/all/rt/0157-stomp-machine-raw-lock.patch.patch
++ features/all/rt/0158-hotplug-Lightweight-get-online-cpus.patch
++ features/all/rt/0159-hotplug-sync_unplug-No.patch
++ features/all/rt/0160-hotplug-Reread-hotplug_pcp-on-pin_current_cpu-retry.patch
++ features/all/rt/0161-sched-migrate-disable.patch.patch
++ features/all/rt/0162-hotplug-use-migrate-disable.patch.patch
++ features/all/rt/0163-hotplug-Call-cpu_unplug_begin-before-DOWN_PREPARE.patch
++ features/all/rt/0164-ftrace-migrate-disable-tracing.patch.patch
++ features/all/rt/0165-tracing-Show-padding-as-unsigned-short.patch
++ features/all/rt/0166-migrate-disable-rt-variant.patch.patch
++ features/all/rt/0167-sched-Optimize-migrate_disable.patch
++ features/all/rt/0168-sched-Generic-migrate_disable.patch
++ features/all/rt/0169-sched-rt-Fix-migrate_enable-thinko.patch
++ features/all/rt/0170-sched-teach-migrate_disable-about-atomic-contexts.patch
++ features/all/rt/0171-sched-Postpone-actual-migration-disalbe-to-schedule.patch
++ features/all/rt/0172-sched-Do-not-compare-cpu-masks-in-scheduler.patch
++ features/all/rt/0173-sched-Have-migrate_disable-ignore-bounded-threads.patch
++ features/all/rt/0174-sched-clear-pf-thread-bound-on-fallback-rq.patch.patch
++ features/all/rt/0175-ftrace-crap.patch.patch
++ features/all/rt/0176-ring-buffer-Convert-reader_lock-from-raw_spin_lock-i.patch
++ features/all/rt/0177-net-netif_rx_ni-migrate-disable.patch.patch
++ features/all/rt/0178-softirq-Sanitize-softirq-pending-for-NOHZ-RT.patch
++ features/all/rt/0179-lockdep-rt.patch.patch
++ features/all/rt/0180-mutex-no-spin-on-rt.patch.patch
++ features/all/rt/0181-softirq-local-lock.patch.patch
++ features/all/rt/0182-softirq-Export-in_serving_softirq.patch
++ features/all/rt/0183-hardirq.h-Define-softirq_count-as-OUL-to-kill-build-.patch
++ features/all/rt/0184-softirq-Fix-unplug-deadlock.patch
++ features/all/rt/0185-softirq-disable-softirq-stacks-for-rt.patch.patch
++ features/all/rt/0186-softirq-make-fifo.patch.patch
++ features/all/rt/0187-tasklet-Prevent-tasklets-from-going-into-infinite-sp.patch
++ features/all/rt/0188-genirq-Allow-disabling-of-softirq-processing-in-irq-.patch
++ features/all/rt/0189-local-vars-migrate-disable.patch.patch
++ features/all/rt/0190-md-raid5-Make-raid5_percpu-handling-RT-aware.patch
++ features/all/rt/0191-rtmutex-lock-killable.patch.patch
++ features/all/rt/0192-rtmutex-futex-prepare-rt.patch.patch
++ features/all/rt/0193-futex-Fix-bug-on-when-a-requeued-RT-task-times-out.patch
++ features/all/rt/0194-rt-mutex-add-sleeping-spinlocks-support.patch.patch
++ features/all/rt/0195-spinlock-types-separate-raw.patch.patch
++ features/all/rt/0196-rtmutex-avoid-include-hell.patch.patch
++ features/all/rt/0197-rt-add-rt-spinlocks.patch.patch
++ features/all/rt/0198-rt-add-rt-to-mutex-headers.patch.patch
++ features/all/rt/0199-rwsem-add-rt-variant.patch.patch
++ features/all/rt/0200-rt-Add-the-preempt-rt-lock-replacement-APIs.patch
++ features/all/rt/0201-rwlocks-Fix-section-mismatch.patch
++ features/all/rt/0202-timer-handle-idle-trylock-in-get-next-timer-irq.patc.patch
++ features/all/rt/0203-RCU-Force-PREEMPT_RCU-for-PREEMPT-RT.patch
++ features/all/rt/0204-rcu-Frob-softirq-test.patch
++ features/all/rt/0205-rcu-Merge-RCU-bh-into-RCU-preempt.patch
++ features/all/rt/0206-rcu-Fix-macro-substitution-for-synchronize_rcu_bh-on.patch
++ features/all/rt/0207-rcu-more-fallout.patch.patch
++ features/all/rt/0208-rcu-Make-ksoftirqd-do-RCU-quiescent-states.patch
++ features/all/rt/0209-rt-rcutree-Move-misplaced-prototype.patch
++ features/all/rt/0210-lglocks-rt.patch.patch
++ features/all/rt/0211-serial-8250-Clean-up-the-locking-for-rt.patch
++ features/all/rt/0212-serial-8250-Call-flush_to_ldisc-when-the-irq-is-thre.patch
++ features/all/rt/0213-drivers-tty-fix-omap-lock-crap.patch.patch
++ features/all/rt/0214-rt-Improve-the-serial-console-PASS_LIMIT.patch
++ features/all/rt/0215-fs-namespace-preemption-fix.patch
++ features/all/rt/0216-mm-protect-activate-switch-mm.patch.patch
++ features/all/rt/0217-fs-block-rt-support.patch.patch
++ features/all/rt/0218-fs-ntfs-disable-interrupt-only-on-RT.patch
++ features/all/rt/0219-x86-Convert-mce-timer-to-hrtimer.patch
++ features/all/rt/0220-x86-stackprotector-Avoid-random-pool-on-rt.patch
++ features/all/rt/0221-x86-Use-generic-rwsem_spinlocks-on-rt.patch
++ features/all/rt/0222-x86-Disable-IST-stacks-for-debug-int-3-stack-fault-f.patch
++ features/all/rt/0223-workqueue-use-get-cpu-light.patch.patch
++ features/all/rt/0224-epoll.patch.patch
++ features/all/rt/0225-mm-vmalloc.patch.patch
++ features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch
++ features/all/rt/0226-workqueue-Fix-cpuhotplug-trainwreck.patch
++ features/all/rt/0227-workqueue-Fix-PF_THREAD_BOUND-abuse.patch
++ features/all/rt/0228-workqueue-Use-get_cpu_light-in-flush_gcwq.patch
++ features/all/rt/0229-hotplug-stuff.patch.patch
++ features/all/rt/0230-debugobjects-rt.patch.patch
++ features/all/rt/0231-jump-label-rt.patch.patch
++ features/all/rt/0232-skbufhead-raw-lock.patch.patch
++ features/all/rt/0233-x86-no-perf-irq-work-rt.patch.patch
++ features/all/rt/0234-console-make-rt-friendly.patch.patch
++ features/all/rt/0235-printk-Disable-migration-instead-of-preemption.patch
++ features/all/rt/0236-power-use-generic-rwsem-on-rt.patch
++ features/all/rt/0237-power-disable-highmem-on-rt.patch.patch
++ features/all/rt/0238-arm-disable-highmem-on-rt.patch.patch
++ features/all/rt/0239-ARM-at91-tclib-Default-to-tclib-timer-for-RT.patch
++ features/all/rt/0240-mips-disable-highmem-on-rt.patch.patch
++ features/all/rt/0241-net-Avoid-livelock-in-net_tx_action-on-RT.patch
++ features/all/rt/0242-ping-sysrq.patch.patch
++ features/all/rt/0243-kgdb-serial-Short-term-workaround.patch
++ features/all/rt/0244-add-sys-kernel-realtime-entry.patch
++ features/all/rt/0245-mm-rt-kmap_atomic-scheduling.patch
++ features/all/rt/0246-ipc-sem-Rework-semaphore-wakeups.patch
++ features/all/rt/0247-sysrq-Allow-immediate-Magic-SysRq-output-for-PREEMPT.patch
++ features/all/rt/0248-x86-kvm-require-const-tsc-for-rt.patch.patch
++ features/all/rt/0249-scsi-fcoe-rt-aware.patch.patch
++ features/all/rt/0250-x86-crypto-Reduce-preempt-disabled-regions.patch
++ features/all/rt/0251-dm-Make-rt-aware.patch
++ features/all/rt/0252-cpumask-Disable-CONFIG_CPUMASK_OFFSTACK-for-RT.patch
++ features/all/rt/0253-seqlock-Prevent-rt-starvation.patch
++ features/all/rt/0254-timer-Fix-hotplug-for-rt.patch
++ features/all/rt/0255-futex-rt-Fix-possible-lockup-when-taking-pi_lock-in-.patch
++ features/all/rt/0256-ring-buffer-rt-Check-for-irqs-disabled-before-grabbi.patch
++ features/all/rt/0257-sched-rt-Fix-wait_task_interactive-to-test-rt_spin_l.patch
++ features/all/rt/0258-lglock-rt-Use-non-rt-for_each_cpu-in-rt-code.patch
++ features/all/rt/0259-cpu-Make-hotplug.lock-a-sleeping-spinlock-on-RT.patch
++ features/all/rt/0260-softirq-Check-preemption-after-reenabling-interrupts.patch
++ features/all/rt/0261-rt-Introduce-cpu_chill.patch
++ features/all/rt/0262-fs-dcache-Use-cpu_chill-in-trylock-loops.patch
++ features/all/rt/0263-net-Use-cpu_chill-instead-of-cpu_relax.patch
++ features/all/rt/0264-kconfig-disable-a-few-options-rt.patch.patch
++ features/all/rt/0265-kconfig-preempt-rt-full.patch.patch
++ features/all/rt/0266-rt-Make-migrate_disable-enable-and-__rt_mutex_init-n.patch

Modified: dists/squeeze-backports/linux/debian/po/ca.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/ca.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/ca.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# Catalan translation of linux-2.6 debconf templates.
+# Catalan translation of linux debconf templates.
 # Copyright © 2010 Software in the Public Interest, Inc.
-# This file is distributed under the same license as linux-2.6's packaging.
+# This file is distributed under the same license as linux's packaging.
 # Jordi Mallach <jordi at debian.org>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-24\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2010-07-16 15:55+0100\n"
 "PO-Revision-Date: 2010-10-25 00:24+0200\n"
 "Last-Translator: Jordi Mallach <jordi at debian.org>\n"

Modified: dists/squeeze-backports/linux/debian/po/cs.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/cs.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/cs.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# Czech PO debconf template translation of linux-2.6.
+# Czech PO debconf template translation of linux.
 # Copyright (C) 2010 Michal Simunek <michal.simunek at gmail.com>
-# This file is distributed under the same license as the linux-2.6 package.
+# This file is distributed under the same license as the linux package.
 # Michal Simunek <michal.simunek at gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-18\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2010-07-25 10:32+0200\n"
 "PO-Revision-Date: 2010-07-26 18:02+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"

Modified: dists/squeeze-backports/linux/debian/po/da.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/da.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/da.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,11 +1,11 @@
-# Danish translation linux-2.6.
-# Copyright (C) 2011 linux-2.6 & Joe Hansen.
-# This file is distributed under the same license as the linux-2.6 package.
+# Danish translation linux.
+# Copyright (C) 2011 Joe Hansen.
+# This file is distributed under the same license as the linux package.
 # Joe Hansen <joedalton2 at yahoo.dk>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6\n"
+"Project-Id-Version: linux\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 10:31+0200\n"
 "PO-Revision-Date: 2011-07-03 05:26+0100\n"

Modified: dists/squeeze-backports/linux/debian/po/de.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/de.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/de.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# Translation of linux-2.6 templates to german.
+# Translation of linux templates to german.
 # Copyright (C) 2010 Holger Wansing.
-# This file is distributed under the same license as the linux-2.6 package.
+# This file is distributed under the same license as the linux package.
 # Holger Wansing <linux at wansing-online.de>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 3.0.0-3\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-07-04 04:24+0100\n"
 "PO-Revision-Date: 2011-09-13 20:41+0200\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"

Modified: dists/squeeze-backports/linux/debian/po/es.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/es.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/es.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,5 +1,5 @@
-# linux-2.6 po-debconf translation to Spanish
-# This file is distributed under the same license as the linux-2.6 package.
+# linux po-debconf translation to Spanish
+# This file is distributed under the same license as the linux package.
 #
 #   Changes:
 #    - Initial translation
@@ -29,7 +29,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32+5\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-07-04 04:24+0100\n"
 "PO-Revision-Date: 2011-07-16 17:59+0200\n"
 "Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"

Modified: dists/squeeze-backports/linux/debian/po/et.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/et.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/et.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,14 +1,14 @@
-# linux-2.6-debconf estonian translation
-# linux-2.6-debconf eesti keele tõlge
+# linux debconf estonian translation
+# linux debconf eesti keele tõlge
 # Copyright (C) 2010 Debian GNU/Linux
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the linux package.
 #
 # mihkel <mihkel turakas com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Project-Id-Version: linux 2.6.32-11\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2010-07-16 15:55+0100\n"
 "PO-Revision-Date: 2010-04-24 14:20+0300\n"
 "Last-Translator: mihkel <turakas gmail com>\n"

Modified: dists/squeeze-backports/linux/debian/po/fr.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/fr.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/fr.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,6 +1,6 @@
-# Translation of linux-2.6 debconf templates to French
+# Translation of linux debconf templates to French
 # Copyright (C) 2010, 2011 Debian French l10n team <debian-l10n-french at lists.debian.org>
-# This file is distributed under the same license as the linux-2.6 package.
+# This file is distributed under the same license as the linux package.
 #
 # David Prévot <david at tilapin.org>, 2010, 2011.
 msgid ""

Modified: dists/squeeze-backports/linux/debian/po/it.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/it.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/it.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,4 +1,4 @@
-# This file is distributed under the same license as the linux-2.6 package.
+# This file is distributed under the same license as the linux package.
 # Collaboratively translated during an online sprint, thanks to all contributors!
 # Luca Bruno <lucab at debian.org>, 2010.
 #

Modified: dists/squeeze-backports/linux/debian/po/ja.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/ja.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/ja.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
 # Copyright (C) 2010 Kenshi Muto <kmuto at debian.org>
 # Copyright (C) 2010 Nobuhiro Iwamatsu <iwamatsu at debian.org>
-# This file is distributed under the same license as the linux-2.6 package.
+# This file is distributed under the same license as the linux package.
 # Kenshi Muto <kmuto at debian.org>, 2010.
 # Nobuhiro Iwamatsu <iwamatsu at debian.org>, 2010.
 
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6\n"
+"Project-Id-Version: linux\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-21 10:37+0200\n"
 "PO-Revision-Date: 2010-10-31 06:32+0900\n"

Modified: dists/squeeze-backports/linux/debian/po/nl.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/nl.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/nl.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# Dutch translation of linux-2.6 po-debconf templates.
-# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the linux-2.6 package.
+# Dutch translation of linux po-debconf templates.
+# Copyright (C) 2011 Willem Kuyn
+# This file is distributed under the same license as the linux package.
 # Willem Kuyn <willemkuyn at gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Project-Id-Version: linux\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-07-04 04:24+0100\n"
 "PO-Revision-Date: 2012-02-04 12:27+0100\n"
 "Last-Translator: willem kuyn <willemkuyn at gmail.com>\n"

Modified: dists/squeeze-backports/linux/debian/po/pl.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/pl.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/pl.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# Translation of linux-2.6 debconf templates to Polish.
-# Copyright (C) 2011
-# This file is distributed under the same license as the linux-2.6 package.
+# Translation of linux debconf templates to Polish.
+# Copyright (C) 2011 Michał Kułach
+# This file is distributed under the same license as the linux package.
 #
 # Michał Kułach <michal.kulach at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-07-04 04:24+0100\n"
 "PO-Revision-Date: 2012-02-05 18:38+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach at gmail.com>\n"

Modified: dists/squeeze-backports/linux/debian/po/pt.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/pt.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/pt.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,11 +1,11 @@
-# Translation of linux-2.6 debconf messages to Portuguese
-# Copyright (C) 2010 the linux-2.6's copyright holder
-# This file is distributed under the same license as the linux-2.6 package.
+# Translation of linux debconf messages to Portuguese
+# Copyright (C) 2010 Américo Monteiro
+# This file is distributed under the same license as the linux package.
 #
 # Américo Monteiro <a_monteiro at netcabo.pt>, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6 2.6.39.1\n"
+"Project-Id-Version: linux 2.6.39.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-05-21 10:31+0200\n"
 "PO-Revision-Date: 2011-05-22 23:53+0100\n"

Modified: dists/squeeze-backports/linux/debian/po/pt_BR.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/pt_BR.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/pt_BR.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# linux-2.6 Brazilian Portuguese debconf template translation.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the linux-2.6 package.
+# linux Brazilian Portuguese debconf template translation.
+# Copyright (C) 2010 Flamarion Jorge
+# This file is distributed under the same license as the linux package.
 # Flamarion Jorge <jorge.flamarion at gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Project-Id-Version: linux\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2010-09-19 10:42+0200\n"
 "PO-Revision-Date: 2010-10-02 12:29-0300\n"
 "Last-Translator: Flamarion Jorge <jorge.flamarion at gmail.com>\n"

Modified: dists/squeeze-backports/linux/debian/po/ru.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/ru.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/ru.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# translation of ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the linux-2.6 package.
+# translation of linux debconf templates to Russian
+# Copyright (C) 2010, 2011 Yuri Kozlov
+# This file is distributed under the same license as the linux package.
 #
 # Yuri Kozlov <yuray at komyakino.ru>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 3.1.6-1\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-07-04 04:24+0100\n"
 "PO-Revision-Date: 2011-12-30 18:35+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"

Modified: dists/squeeze-backports/linux/debian/po/sk.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/sk.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/sk.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,13 +1,13 @@
-# Slovak translations for linux-2.6 package
-# Slovenské preklady pre balík linux-2.6.
-# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the linux-2.6 package.
+# Slovak translations for linux package
+# Slovenské preklady pre balík linux.
+# Copyright (C) 2011 Slavko
+# This file is distributed under the same license as the linux package.
 # Slavko <linux at slavino.sk>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-29\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-06-09 10:31+0200\n"
 "PO-Revision-Date: 2011-07-10 09:19+0200\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"

Modified: dists/squeeze-backports/linux/debian/po/sv.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/sv.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/sv.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# Translation of linux-2.6 debconf template to Swedish
+# Translation of linux debconf template to Swedish
 # Copyright (C) 2010 Martin Bagge <brother at bsnet.se>
-# This file is distributed under the same license as the linux-2.6 package.
+# This file is distributed under the same license as the linux package.
 #
 # Martin Bagge <brother at bsnet.se>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Project-Id-Version: linux\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-05-21 10:31+0200\n"
 "PO-Revision-Date: 2011-06-02 14:52+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"

Modified: dists/squeeze-backports/linux/debian/po/templates.pot
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/templates.pot	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/templates.pot	Fri Jun 29 01:05:07 2012	(r19228)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-07-04 04:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"

Modified: dists/squeeze-backports/linux/debian/po/tr.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/tr.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/tr.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,12 +1,12 @@
-# Turkish translation of linux-2.6 debconf template.
-# Copyright (C) 2012
-# This file is distributed under the same license as the linux-2.6 package.
+# Turkish translation of linux debconf template.
+# Copyright (C) 2012 Mert Dirik
+# This file is distributed under the same license as the linux package.
 # Mert Dirik <mertdirik at gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 3.2.4-1\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2011-07-04 04:24+0100\n"
 "PO-Revision-Date: 2012-02-12 22:36+0200\n"
 "Last-Translator: Mert Dirik <mertdirik at gmail.com>\n"

Modified: dists/squeeze-backports/linux/debian/po/vi.po
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/po/vi.po	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/po/vi.po	Fri Jun 29 01:05:07 2012	(r19228)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-26\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"Report-Msgid-Bugs-To: linux at packages.debian.org\n"
 "POT-Creation-Date: 2010-10-21 10:37+0200\n"
 "PO-Revision-Date: 2010-10-27 15:21+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"

Modified: dists/squeeze-backports/linux/debian/rules
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/rules	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/rules	Fri Jun 29 01:05:07 2012	(r19228)
@@ -23,12 +23,8 @@
 source: debian/control $(STAMPS_DIR)/source-base
 $(STAMPS_DIR)/source-base:
 	dh_testdir
-	$(MAKE) -f debian/rules.gen source_$(DEB_HOST_ARCH)
-	@$(stamp)
-
-source-all: debian/control
-	dh_testdir
 	$(MAKE) -f debian/rules.gen source
+	@$(stamp)
 
 setup: debian/control $(STAMPS_DIR)/setup-base
 $(STAMPS_DIR)/setup-base: $(STAMPS_DIR)/source-base
@@ -58,12 +54,12 @@
 endif
 
 maintainerclean:
-	rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen debian/bin/patch.*
+	rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen
 	rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*))
 
 clean: debian/control
 	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/linux-patch-debian-* debian/xen-linux-system-* debian/*-modules-*-di*
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/xen-linux-system-* debian/*-modules-*-di*
 	dh_clean
 
 binary-indep: $(STAMPS_DIR)/source-base

Modified: dists/squeeze-backports/linux/debian/rules.real
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/rules.real	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/rules.real	Fri Jun 29 01:05:07 2012	(r19228)
@@ -48,7 +48,6 @@
 
 binary-indep: install-doc
 binary-indep: install-manual
-binary-indep: install-patch
 binary-indep: install-source
 binary-indep: install-support
 
@@ -56,8 +55,7 @@
 
 setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
-source-arch: $(STAMPS_DIR)/source
-source-featureset: $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
+source-featureset: $(STAMPS_DIR)/source_$(FEATURESET)
 
 $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG)
 	python debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS)
@@ -84,18 +82,18 @@
 	$(patch_cmd)
 	@$(stamp)
 
-$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
-$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
-$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source
+$(STAMPS_DIR)/source_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(FEATURESET)
+$(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
-	$(patch_cmd) -a $(ARCH) -f $(FEATURESET)
+	$(patch_cmd) -f $(FEATURESET)
 	@$(stamp)
 
 $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source_$(FEATURESET)
 $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET) $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/source_$(FEATURESET) $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 	rm -rf '$(DIR)'
 	mkdir '$(DIR)'
 	cp '$(CONFIG)' '$(DIR)/.config'
@@ -196,9 +194,9 @@
 install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
 install-headers_$(ARCH)_$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME)
 install-headers_$(ARCH)_$(FEATURESET): BASE_DIR = /usr/src/$(PACKAGE_NAME)
-install-headers_$(ARCH)_$(FEATURESET): SOURCE_DIR = $(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
+install-headers_$(ARCH)_$(FEATURESET): SOURCE_DIR = $(BUILD_DIR)/source_$(FEATURESET)
 install-headers_$(ARCH)_$(FEATURESET): DIR = debian/$(PACKAGE_NAME)/$(BASE_DIR)
-install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
+install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(FEATURESET)
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -227,7 +225,7 @@
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR_COMMON = /usr/src/$(PACKAGE_NAME_COMMON)
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source_$(FEATURESET)
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
@@ -473,21 +471,6 @@
 	dh_gencontrol
 	dh_builddeb
 
-install-patch: PACKAGE = linux-patch-debian-$(VERSION)
-install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAMVERSION)
-install-patch: pfull := debian/$(PACKAGE)$(pbase)
-install-patch: DH_OPTIONS = -p$(PACKAGE)
-install-patch:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
-	dh_install -X.svn debian/patches/* '$(pbase)/debian'
-	install debian/bin/patch.apply '$(pfull)/apply/debian'
-	install debian/templates/patch.unpatch '$(pfull)/unpatch/debian'
-	find '$(pfull)/debian' ! -path '*/series/*' -type f -execdir bzip2 '{}' ';' -execdir chmod 644 '{}.bz2' ';'
-	+$(MAKE_SELF) install-base
-
 install-source: DH_OPTIONS = -plinux-source-$(VERSION)
 install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2
 	dh_testdir

Modified: dists/squeeze-backports/linux/debian/templates/control.main.in
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/control.main.in	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/templates/control.main.in	Fri Jun 29 01:05:07 2012	(r19228)
@@ -41,19 +41,6 @@
  may be installed at a time.  The linux-doc package containing the
  documentation in other formats is free from such restriction.
 
-Package: linux-patch-debian- at version@
-Architecture: all
-Depends: bzip2, linux-support- at abiname@, python, ${misc:Depends}
-Suggests: linux-source- at version@
-Description: Debian patches to version @version@ of the Linux kernel
- This package includes the patches used to produce the prepackaged
- linux-source- at version@ package, as well as architecture-specific
- patches.
- .
- Note that these patches do NOT apply against a pristine
- Linux @version@ kernel but only against the kernel tarball
- @source_package at _@source_upstream at .orig.tar.gz from the Debian archive.
-
 Package: linux-support- at abiname@
 Architecture: all
 Section: devel

Modified: dists/squeeze-backports/linux/debian/templates/control.source.in
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/control.source.in	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/templates/control.source.in	Fri Jun 29 01:05:07 2012	(r19228)
@@ -3,7 +3,7 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel]
+Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel]
 Build-Depends-Indep: bzip2, xmlto
-Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-2.6/
-Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-2.6/
+Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/
+Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/

Modified: dists/squeeze-backports/linux/debian/templates/image.plain.bug/control
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/image.plain.bug/control	Thu Jun 28 13:57:52 2012	(r19227)
+++ dists/squeeze-backports/linux/debian/templates/image.plain.bug/control	Fri Jun 29 01:05:07 2012	(r19228)
@@ -1,2 +1,2 @@
-Submit-As: linux-2.6
+Submit-As: src:linux
 Package-Status: firmware-atheros firmware-bnx2 firmware-bnx2x firmware-brcm80211 firmware-intelwimax firmware-ipw2x00 firmware-ivtv firmware-iwlwifi firmware-libertas firmware-linux firmware-linux-nonfree firmware-myricom firmware-netxen firmware-qlogic firmware-ralink firmware-realtek xen-hypervisor

