Tue Jun 26 06:02:56 UTC 2012

Author: benh
Date: Tue Jun 26 06:02:51 2012
New Revision: 19211

Log:
Merge changes from sid up to 3.2.21-2

Added:
   dists/trunk/linux/debian/installer/armel/modules/armel-iop32x/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/armel/modules/armel-iop32x/ipv6-modules
   dists/trunk/linux/debian/installer/armel/modules/armel-kirkwood/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/ipv6-modules
   dists/trunk/linux/debian/installer/armel/modules/armel-orion5x/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/armel/modules/armel-orion5x/ipv6-modules
   dists/trunk/linux/debian/installer/armel/modules/armel-versatile/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/armel/modules/armel-versatile/ipv6-modules
   dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/ipv6-modules
   dists/trunk/linux/debian/installer/m68k/modules/m68k-mac/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/m68k/modules/m68k-mac/ipv6-modules
   dists/trunk/linux/debian/installer/m68k/modules/m68k/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/m68k/modules/m68k/ipv6-modules
   dists/trunk/linux/debian/installer/ppc64/
      - copied from r19210, dists/sid/linux/debian/installer/ppc64/
   dists/trunk/linux/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules
   dists/trunk/linux/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules
      - copied unchanged from r19210, dists/sid/linux/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules
   dists/trunk/linux/debian/patches/features/all/cpu-devices/
      - copied from r19210, dists/sid/linux/debian/patches/features/all/cpu-devices/
   dists/trunk/linux/debian/patches/features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch
      - copied unchanged from r19210, dists/sid/linux/debian/patches/features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch
   dists/trunk/linux/debian/patches/features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch
      - copied unchanged from r19210, dists/sid/linux/debian/patches/features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch
   dists/trunk/linux/debian/patches/features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch
      - copied unchanged from r19210, dists/sid/linux/debian/patches/features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch
   dists/trunk/linux/debian/patches/features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch
      - copied unchanged from r19210, dists/sid/linux/debian/patches/features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch
   dists/trunk/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch
      - copied unchanged from r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch
   dists/trunk/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch
      - copied unchanged from r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch
   dists/trunk/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch
      - copied unchanged from r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch
   dists/trunk/linux/debian/patches/features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch
      - copied, changed from r19210, dists/sid/linux/debian/patches/features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch
Deleted:
   dists/trunk/linux/debian/patches/features/all/cpu-devices/ACPI-Load-acpi-cpufreq-from-processor-driver-automat.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/Add-driver-auto-probing-for-x86-features-v4.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/CPU-Introduce-ARCH_HAS_CPU_AUTOPROBE-and-X86-parts.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/HWMON-Convert-coretemp-to-x86-cpuid-autoprobing.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/HWMON-Convert-via-cputemp-to-x86-cpuid-autoprobing.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/X86-Introduce-HW-Pstate-scattered-cpuid-feature.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/cpu-Do-not-return-errors-from-cpu_dev_init-which-wil.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/cpu-convert-cpu-and-machinecheck-sysdev_class-to-a-r.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/cpufreq-Add-support-for-x86-cpuinfo-auto-loading-v4.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/cpufreq-gx-Fix-the-compile-error.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/crypto-Add-support-for-x86-cpuid-auto-loading-for-x8.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/driver-core-cpu-fix-kobject-warning-when-hotplugging.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/driver-core-cpu-remove-kernel-warning-when-removing-.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/driver-core-implement-sysdev-functionality-for-regul.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/intel-idle-convert-to-x86_cpu_id-auto-probing.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/intel_idle-Fix-ID-for-Nehalem-EX-Xeon-in-device-ID-t.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/mce-fix-warning-messages-about-static-struct-mce_dev.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/powernow-k6-Really-enable-auto-loading.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/powernow-k7-Fix-CPU-family-number.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/tracing-mm-Move-include-of-trace-events-kmem.h-out-o.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/x86-cpu-Clean-up-modalias-feature-matching.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/x86-cpu-Fix-overrun-check-in-arch_print_cpu_modalias.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/x86-mce-Convert-static-array-of-pointers-to-per-cpu-.patch
   dists/trunk/linux/debian/patches/features/all/cpu-devices/x86-mce-Fix-CPU-hotplug-and-suspend-regression-relat.patch
Modified:
   dists/trunk/linux/   (props changed)
   dists/trunk/linux/debian/README.Debian
   dists/trunk/linux/debian/bin/gencontrol.py
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/armel/config.kirkwood
   dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
   dists/trunk/linux/debian/config/powerpc/config
   dists/trunk/linux/debian/installer/amd64/modules/amd64/crc-modules
   dists/trunk/linux/debian/installer/amd64/package-list
   dists/trunk/linux/debian/installer/armel/package-list
   dists/trunk/linux/debian/installer/i386/modules/i386/crc-modules
   dists/trunk/linux/debian/installer/i386/package-list
   dists/trunk/linux/debian/installer/ia64/package-list
   dists/trunk/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/fb-modules
   dists/trunk/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fb-modules
   dists/trunk/linux/debian/installer/modules/crc-modules
   dists/trunk/linux/debian/installer/modules/input-modules
   dists/trunk/linux/debian/installer/package-list
   dists/trunk/linux/debian/installer/powerpc/package-list
   dists/trunk/linux/debian/lib/python/debian_linux/gencontrol.py
   dists/trunk/linux/debian/patches/features/all/wacom/0026-Input-wacom-return-proper-error-if-usb_get_extra_des.patch
   dists/trunk/linux/debian/patches/series
   dists/trunk/linux/debian/rules
   dists/trunk/linux/debian/rules.real
   dists/trunk/linux/debian/templates/control.image.type-plain.in

Modified: dists/trunk/linux/debian/README.Debian
==============================================================================

--- dists/trunk/linux/debian/README.Debian	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/README.Debian	Tue Jun 26 06:02:51 2012	(r19211)
@@ -52,4 +52,5 @@
 Further information
 -------------------
 Debian Linux Kernel Handbook: http://kernel-handbook.alioth.debian.org
+                              or debian-kernel-handbook package
 Debian Wiki: http://wiki.debian.org/DebianKernel

Modified: dists/trunk/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/bin/gencontrol.py	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/bin/gencontrol.py	Tue Jun 26 06:02:51 2012	(r19211)
@@ -60,11 +60,7 @@
             'SOURCEVERSION': self.version.complete,
         })
 
-    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
+    def do_main_makefile(self, makefile, makeflags, extra):
         for featureset in iter(self.config['base', ]['featuresets']):
             makeflags_featureset = makeflags.copy()
             makeflags_featureset['FEATURESET'] = featureset
@@ -75,7 +71,12 @@
                          ['source_%s_real' % featureset])
             makefile.add('source', ['source_%s' % featureset])
 
-        super(Gencontrol, self).do_main_recurse(packages, makefile, vars, makeflags, extra)
+        makeflags = makeflags.copy()
+        makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets'])
+        super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
+
+    def do_main_packages(self, packages, vars, makeflags, extra):
+        packages.extend(self.process_packages(self.templates["control.main"], self.vars))
 
     arch_makeflags = (
         ('kernel-arch', 'KERNEL_ARCH', False),
@@ -121,34 +122,38 @@
                      ["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
                       (arch, makeflags)])
 
-        # Add udebs using kernel-wedge
-        installer_def_dir = 'debian/installer'
-        installer_arch_dir = os.path.join(installer_def_dir, arch)
-        if os.path.isdir(installer_arch_dir):
-            kw_env = os.environ.copy()
-            kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
-            kw_env['KW_CONFIG_DIR'] = installer_arch_dir
-            kw_proc = subprocess.Popen(
-                ['kernel-wedge', 'gen-control',
-                 self.abiname],
-                stdout=subprocess.PIPE,
-                env=kw_env)
-            udeb_packages = read_control(kw_proc.stdout)
-            kw_proc.wait()
-            if kw_proc.returncode != 0:
-                raise RuntimeError('kernel-wedge exited with code %d' %
-                                   kw_proc.returncode)
-
-            self.merge_packages(packages, udeb_packages, arch)
-
-            # These packages must be built after the per-flavour/
-            # per-featureset packages.
-            makefile.add(
-                'binary-arch_%s' % arch,
-                cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
-                        "PACKAGE_NAMES='%s'" %
-                        (arch, makeflags,
-                         ' '.join(p['Package'] for p in udeb_packages))])
+        if self.changelog[0].distribution == 'UNRELEASED' and os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
+            import warnings
+            warnings.warn(u'Disable building of debug infos on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+        else:
+            # Add udebs using kernel-wedge
+            installer_def_dir = 'debian/installer'
+            installer_arch_dir = os.path.join(installer_def_dir, arch)
+            if os.path.isdir(installer_arch_dir):
+                kw_env = os.environ.copy()
+                kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
+                kw_env['KW_CONFIG_DIR'] = installer_arch_dir
+                kw_proc = subprocess.Popen(
+                    ['kernel-wedge', 'gen-control',
+                     self.abiname],
+                    stdout=subprocess.PIPE,
+                    env=kw_env)
+                udeb_packages = read_control(kw_proc.stdout)
+                kw_proc.wait()
+                if kw_proc.returncode != 0:
+                    raise RuntimeError('kernel-wedge exited with code %d' %
+                                       kw_proc.returncode)
+
+                self.merge_packages(packages, udeb_packages, arch)
+
+                # These packages must be built after the per-flavour/
+                # per-featureset packages.
+                makefile.add(
+                    'binary-arch_%s' % arch,
+                    cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
+                            "PACKAGE_NAMES='%s'" %
+                            (arch, makeflags,
+                             ' '.join(p['Package'] for p in udeb_packages))])
 
     def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
         config_base = self.config.merge('base', arch, featureset)
@@ -289,7 +294,7 @@
 
         if build_debug and self.changelog[0].distribution == 'UNRELEASED' and os.getenv('DEBIAN_KERNEL_DISABLE_DEBUG'):
             import warnings
-            warnings.warn(u'Disable building of debug infos on request (DEBIAN_KERNEL_DISABLE_DEBUG)')
+            warnings.warn(u'Disable building of debug infos on request (DEBIAN_KERNEL_DISABLE_DEBUG set)')
             build_debug = False
 
         if build_debug:
@@ -345,10 +350,10 @@
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags]
         if packages_dummy:
             cmds_binary_arch.append("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags))
-        cmds_build = ["$(MAKE) -f debian/rules.real build %s" % makeflags]
+        cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" % makeflags]
         cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags]
         makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_binary_arch)
-        makefile.add('build_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build)
+        makefile.add('build-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build)
         makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_setup)
 
     def merge_packages(self, packages, new, arch):

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/changelog	Tue Jun 26 06:02:51 2012	(r19211)
@@ -115,6 +115,75 @@
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 04 Mar 2012 20:27:42 +0000
 
+linux (3.2.21-2) unstable; urgency=low
+
+  * [i386] cpufreq/gx: Fix the compile error
+  * [powerpc] Enable PPC_DISABLE_WERROR (fixes FTBFS)
+  * tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
+    (fixes FTBFS on sparc)
+  * [i386] Disable incomplete lguest support
+  * udeb: Add missing dependencies for various modules (see #678587)
+    - [armel/kirkwood] fb-modules depends on kernel-image
+    - [ia64] nic-usb-modules depends on kernel-image, nic-shared-modules,
+      usb-modules
+    - [ia64] sata-modules depends on kernel-image, scsi-core-modules
+    - [ia64] scsi-modules depends on scsi-core-modules
+    - [ia64,powerpc,ppc64] pcmcia-modules depends on kernel-image
+    - [powerpc,ppc64] nic-pcmcia-modules depends on kernel-image,
+      nic-shared-modules, pcmcia-modules
+    - [powerpc,ppc64,x86] scsi-modules depends on ata-modules
+    - [x86] nic-extra-modules depends on i2c-modules
+  * wacom: do not crash when retrieving touch_max (Closes: #678798)
+  * wacom: Revert unintended changes to handling of Tablet PCs
+    (Closes: #677164)
+  * linux-image, README.Debian: Suggest debian-kernel-handbook package
+
+  [ Arnaud Patard ]
+  * [armel, armhf] backport BPF JIT support
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 26 Jun 2012 01:56:42 +0100
+
+linux (3.2.21-1) unstable; urgency=low
+
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.21
+    - NFSv4.1: Fix a request leak on the back channel
+    - target: Return error to initiator if SET TARGET PORT GROUPS emulation
+      fails
+    - USB: add NO_D3_DURING_SLEEP flag and revert 151b61284776be2
+    - USB: fix gathering of interface associations
+
+  [ Ben Hutchings ]
+  * [ia64,powerpc] udeb: Add crc-itu-t to crc-modules; make
+    firewire-core-modules depend on it (fixes FTBFS)
+  * [arm,m68k,sh4] udeb: Build ipv6-modules
+  * ethtool: allow ETHTOOL_GSSET_INFO for users
+  * [rt] bump version to 3.2.20-rt32
+  * cpu: Convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem
+  * [x86] Add driver auto probing for x86 features
+    - crypto: Add support for x86 cpuid auto loading for x86 crypto drivers
+      (Closes: #568008)
+    - intel-idle: convert to x86_cpu_id auto probing
+    - HWMON: Convert coretemp to x86 cpuid autoprobing
+    - HWMON: Convert via-cputemp to x86 cpuid autoprobing
+    - cpufreq: Add support for x86 cpuinfo auto loading (Closes: #664813)
+  * [x86] ACPI: Load acpi-cpufreq from processor driver automatically
+  * Bump ABI to 3
+  * input: Add Synaptics USB device driver (Closes: #678071)
+  * [x86] udeb: Fix dependencies for nic-wireless-modules
+
+  [ Aurelien Jarno ]
+  * [mips,mipsel] udeb: Remove rivafb and nvidiafb.
+  * [ppc64]: add udebs, based on powerpc/powerpc64.
+
+  [ Bastian Blank ]
+  * Support build-arch and build-indep make targets.
+
+  [ Arnaud Patard ]
+  * [armel/kirkwood] Add dreamplug and iconnect support (Closes: #675922)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 22 Jun 2012 13:54:15 +0100
+
 linux (3.2.20-1) unstable; urgency=low
 
   * The "Confused? You Won't Be" release

Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood	Tue Jun 26 06:02:51 2012	(r19211)
@@ -37,6 +37,8 @@
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
@@ -57,6 +59,9 @@
 CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
+CONFIG_ARCH_KIRKWOOD_DT=y
+CONFIG_MACH_DREAMPLUG_DT=y
+CONFIG_MACH_ICONNECT_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
@@ -287,6 +292,7 @@
 CONFIG_MTD=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
@@ -345,6 +351,7 @@
 ## file: drivers/mtd/maps/Kconfig
 ##
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -457,6 +464,11 @@
 CONFIG_MWIFIEX_SDIO=m
 
 ##
+## file: drivers/of/Kconfig
+##
+CONFIG_PROC_DEVICETREE=y
+
+##
 ## file: drivers/pcmcia/Kconfig
 ##
 # CONFIG_PCCARD is not set
@@ -554,6 +566,8 @@
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 # CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_DW is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 
 ##
 ## file: drivers/usb/Kconfig

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32	Tue Jun 26 06:02:51 2012	(r19211)
@@ -45,7 +45,7 @@
 ##
 ## file: arch/x86/lguest/Kconfig
 ##
-CONFIG_LGUEST_GUEST=y
+# CONFIG_LGUEST_GUEST is not set
 
 ##
 ## file: crypto/Kconfig
@@ -189,7 +189,7 @@
 ##
 ## file: drivers/lguest/Kconfig
 ##
-CONFIG_LGUEST=m
+# CONFIG_LGUEST is not set
 
 ##
 ## file: drivers/macintosh/Kconfig

Modified: dists/trunk/linux/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux/debian/config/powerpc/config	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/config/powerpc/config	Tue Jun 26 06:02:51 2012	(r19211)
@@ -19,6 +19,7 @@
 ##
 ## file: arch/powerpc/Kconfig.debug
 ##
+CONFIG_PPC_DISABLE_WERROR=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set

Modified: dists/trunk/linux/debian/installer/amd64/modules/amd64/crc-modules
==============================================================================
--- dists/trunk/linux/debian/installer/amd64/modules/amd64/crc-modules	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/amd64/modules/amd64/crc-modules	Tue Jun 26 06:02:51 2012	(r19211)
@@ -1,2 +1 @@
 #include <crc-modules>
-crc-itu-t

Modified: dists/trunk/linux/debian/installer/amd64/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/amd64/package-list	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/amd64/package-list	Tue Jun 26 06:02:51 2012	(r19211)
@@ -17,19 +17,10 @@
 Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
 
 Package: scsi-modules
-Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules
-
-Package: nic-extra-modules
-Depends: kernel-image, nic-shared-modules, core-modules, crc-modules
-
-Package: nic-wireless-modules
-Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, crypto-core-modules, crc-modules
+Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
 
 Package: pcmcia-modules
 Depends: kernel-image, core-modules
 
-Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules, crc-modules
-
 Package: nbd-modules
 Depends: kernel-image

Copied: dists/trunk/linux/debian/installer/armel/modules/armel-iop32x/ipv6-modules (from r19210, dists/sid/linux/debian/installer/armel/modules/armel-iop32x/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armel/modules/armel-iop32x/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/armel/modules/armel-iop32x/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Copied: dists/trunk/linux/debian/installer/armel/modules/armel-kirkwood/ipv6-modules (from r19210, dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armel/modules/armel-kirkwood/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Copied: dists/trunk/linux/debian/installer/armel/modules/armel-orion5x/ipv6-modules (from r19210, dists/sid/linux/debian/installer/armel/modules/armel-orion5x/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armel/modules/armel-orion5x/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/armel/modules/armel-orion5x/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Copied: dists/trunk/linux/debian/installer/armel/modules/armel-versatile/ipv6-modules (from r19210, dists/sid/linux/debian/installer/armel/modules/armel-versatile/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armel/modules/armel-versatile/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/armel/modules/armel-versatile/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Modified: dists/trunk/linux/debian/installer/armel/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/armel/package-list	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/armel/package-list	Tue Jun 26 06:02:51 2012	(r19211)
@@ -22,7 +22,7 @@
  This package contains beeper drivers for the kernel.
 
 Package: fb-modules
-Depends: usb-modules, nls-core-modules
+Depends: kernel-image, usb-modules, nls-core-modules
 
 Package: pata-modules
 Depends: kernel-image, ata-modules

Copied: dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/ipv6-modules (from r19210, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Modified: dists/trunk/linux/debian/installer/i386/modules/i386/crc-modules
==============================================================================
--- dists/trunk/linux/debian/installer/i386/modules/i386/crc-modules	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/i386/modules/i386/crc-modules	Tue Jun 26 06:02:51 2012	(r19211)
@@ -1,2 +1 @@
 #include <crc-modules>
-crc-itu-t ?

Modified: dists/trunk/linux/debian/installer/i386/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/i386/package-list	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/i386/package-list	Tue Jun 26 06:02:51 2012	(r19211)
@@ -20,19 +20,10 @@
 Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
 
 Package: scsi-modules
-Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules
-
-Package: nic-extra-modules
-Depends: kernel-image, nic-shared-modules, core-modules, crc-modules
-
-Package: nic-wireless-modules
-Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, crypto-core-modules, crc-modules
+Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
 
 Package: pcmcia-modules
 Depends: kernel-image, core-modules
 
-Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules, crc-modules
-
 Package: nbd-modules
 Depends: kernel-image

Modified: dists/trunk/linux/debian/installer/ia64/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/ia64/package-list	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/ia64/package-list	Tue Jun 26 06:02:51 2012	(r19211)
@@ -12,17 +12,8 @@
 Package: nic-modules
 Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules
 
-Package: nic-usb-modules
-Depends: core-modules
-
 Package: pcmcia-modules
-Depends: core-modules
-
-Package: sata-modules
-Depends: ata-modules
-
-Package: scsi-modules
-Depends: kernel-image, ata-modules, parport-modules, cdrom-core-modules, core-modules
+Depends: kernel-image, core-modules
 
 Package: serial-modules
 Depends: kernel-image, pcmcia-modules, sn-modules

Copied: dists/trunk/linux/debian/installer/m68k/modules/m68k-mac/ipv6-modules (from r19210, dists/sid/linux/debian/installer/m68k/modules/m68k-mac/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/m68k/modules/m68k-mac/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/m68k/modules/m68k-mac/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Copied: dists/trunk/linux/debian/installer/m68k/modules/m68k/ipv6-modules (from r19210, dists/sid/linux/debian/installer/m68k/modules/m68k/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/m68k/modules/m68k/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/m68k/modules/m68k/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Modified: dists/trunk/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/fb-modules
==============================================================================
--- dists/trunk/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/fb-modules	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/fb-modules	Tue Jun 26 06:02:51 2012	(r19211)
@@ -16,9 +16,7 @@
 matroxfb_g450
 matroxfb_misc
 neofb
-nvidiafb
 pm2fb
-rivafb
 savagefb
 sisfb
 sstfb

Modified: dists/trunk/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fb-modules
==============================================================================
--- dists/trunk/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fb-modules	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fb-modules	Tue Jun 26 06:02:51 2012	(r19211)
@@ -16,9 +16,7 @@
 matroxfb_g450
 matroxfb_misc
 neofb
-nvidiafb
 pm2fb
-rivafb
 savagefb
 sisfb
 sstfb

Modified: dists/trunk/linux/debian/installer/modules/crc-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/crc-modules	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/modules/crc-modules	Tue Jun 26 06:02:51 2012	(r19211)
@@ -1,3 +1,4 @@
 crc-ccitt
 libcrc32c
 crc32c
+crc-itu-t

Modified: dists/trunk/linux/debian/installer/modules/input-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/input-modules	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/modules/input-modules	Tue Jun 26 06:02:51 2012	(r19211)
@@ -7,4 +7,5 @@
 hid-monterey ?
 hid-sunplus ?
 hid-cherry ?
+synaptics_usb ?
 wistron_btns ?

Modified: dists/trunk/linux/debian/installer/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/package-list	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/package-list	Tue Jun 26 06:02:51 2012	(r19211)
@@ -22,7 +22,7 @@
  This package contains rare NIC drivers for the kernel.
 
 Package: nic-wireless-modules
-Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, mmc-modules, pcmcia-modules
+Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, mmc-modules, pcmcia-modules, crypto-core-modules, crc-modules
 Priority: standard
 Description: Wireless NIC drivers
  This package contains wireless NIC drivers for the kernel.
@@ -77,14 +77,8 @@
 Description: CDROM support
  This package contains core CDROM support for the kernel.
 
-Package: cdrom-modules
-Depends: kernel-image, ide-modules, cdrom-core-modules
-Priority: optional
-Description: Esoteric CDROM drivers
- This package contains esoteric CDROM drivers for the kernel.
-
 Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules
+Depends: kernel-image, scsi-core-modules, crc-modules
 Priority: standard
 Description: Core FireWire drivers
  This package contains core FireWire drivers for the kernel.
@@ -139,12 +133,6 @@
 Description: IPv6 driver
  This package contains the IPv6 driver for the kernel.
 
-Package: nls-core-modules
-Depends: kernel-image
-Priority: extra
-Description: Core NLS support
- This package contains basic NLS support modules for the kernel.
-
 Package: btrfs-modules
 Depends: kernel-image, core-modules, crc-modules, zlib-modules, lzo-modules
 Priority: extra
@@ -229,12 +217,6 @@
 Description: UFS filesystem support
  This package contains the UFS filesystem module for the kernel.
 
-Package: zfs-modules
-Depends: kernel-image
-Priority: extra
-Description: ZFS filesystem support
- This package contains the ZFS filesystem module for the kernel.
-
 Package: qnx4-modules
 Depends: kernel-image
 Priority: extra
@@ -253,12 +235,6 @@
 Description: NFS filesystem support
  This package contains the NFS filesystem module for the kernel.
 
-Package: nullfs-modules
-Depends: kernel-image
-Priority: standard
-Description: nullfs filesystem support
- This package contains the nullfs filesystem module for the kernel.
-
 Package: md-modules
 Depends: kernel-image
 Priority: extra
@@ -419,12 +395,6 @@
  This package contains the modules required for support of the Network Block
  Device
 
-Package: loop-aes-modules
-Depends: kernel-image!
-Priority: extra
-Description: loop-AES crypto modules
- This package contains loop-AES crypto modules.
-
 Package: squashfs-modules
 Depends: kernel-image
 Priority: extra

Modified: dists/trunk/linux/debian/installer/powerpc/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/powerpc/package-list	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/installer/powerpc/package-list	Tue Jun 26 06:02:51 2012	(r19211)
@@ -16,13 +16,13 @@
 Depends: kernel-image, ata-modules, core-modules
 
 Package: scsi-modules
-Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules
+Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
 
 Package: pcmcia-modules
-Depends: core-modules
+Depends: kernel-image, core-modules
 
 Package: nic-pcmcia-modules
-Depends: nic-modules, nic-wireless-modules, core-modules
+Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, core-modules
 
 Package: hypervisor-modules
 Depends: kernel-image

Copied: dists/trunk/linux/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules (from r19210, dists/sid/linux/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Copied: dists/trunk/linux/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules (from r19210, dists/sid/linux/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules)
@@ -0,0 +1 @@
+#include <ipv6-modules>

Modified: dists/trunk/linux/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/lib/python/debian_linux/gencontrol.py	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/lib/python/debian_linux/gencontrol.py	Tue Jun 26 06:02:51 2012	(r19211)
@@ -77,7 +77,7 @@
 
 
 class Gencontrol(object):
-    makefile_targets = ('binary-arch', 'build', 'setup')
+    makefile_targets = ('binary-arch', 'build-arch', 'setup')
 
     def __init__(self, config, templates, version=Version):
         self.config, self.templates = config, templates
@@ -114,8 +114,7 @@
         pass
 
     def do_main_makefile(self, makefile, makeflags, extra):
-        makeflags = makeflags.copy()
-        makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets'])
+        makefile.add('build-indep', cmds=["$(MAKE) -f debian/rules.real build-indep %s" % makeflags])
         makefile.add('binary-indep', cmds=["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
 
     def do_main_packages(self, packages, vars, makeflags, extra):

Modified: dists/trunk/linux/debian/patches/features/all/wacom/0026-Input-wacom-return-proper-error-if-usb_get_extra_des.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/all/wacom/0026-Input-wacom-return-proper-error-if-usb_get_extra_des.patch	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/patches/features/all/wacom/0026-Input-wacom-return-proper-error-if-usb_get_extra_des.patch	Tue Jun 26 06:02:51 2012	(r19211)
@@ -36,6 +36,3 @@
  			goto out;
  		}
  	}
--- 
-1.7.10
-

Copied: dists/trunk/linux/debian/patches/features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch (from r19210, dists/sid/linux/debian/patches/features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/patches/features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch)
@@ -0,0 +1,44 @@
+From: Ping Cheng <pinglinux at gmail.com>
+Date: Sun, 24 Jun 2012 09:48:03 -0500
+Subject: wacom: do not crash when retrieving touch_max
+Bug-Debian: http://bugs.debian.org/678798
+
+When rep_data was an array
+
+	unsigned char rep_data[2];
+
+spelling its address as &rep_data was perfectly valid, but now that
+it is dynamically allocated
+
+	unsigned char *rep_data = kmalloc(2, GFP_KERNEL);
+
+that expression returns a pointer to the pointer rather than to the
+array itself.  Regression introduced by commit f393ee2b814e (Input:
+wacom - retrieve maximum number of touch points, 2012-04-29).
+
+[jn: from mailing list discussion, with new description.
+ This change is also available as part of a larger commit in the
+ input-wacom repository.]
+
+Signed-off-by: Ping Cheng <pingc at wacom.com>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+---
+ drivers/input/tablet/wacom_sys.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
+index cad5602d3ce4..6b1cd71ba320 100644
+--- a/drivers/input/tablet/wacom_sys.c
++++ b/drivers/input/tablet/wacom_sys.c
+@@ -216,7 +216,7 @@ static void wacom_retrieve_report_data(struct usb_interface *intf,
+ 
+ 		rep_data[0] = 12;
+ 		result = wacom_get_report(intf, WAC_HID_FEATURE_REPORT,
+-					  rep_data[0], &rep_data, 2,
++					  rep_data[0], rep_data, 2,
+ 					  WAC_MSG_RETRIES);
+ 
+ 		if (result >= 0 && rep_data[1] > 2)
+-- 
+1.7.11.rc3
+

Copied: dists/trunk/linux/debian/patches/features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch (from r19210, dists/sid/linux/debian/patches/features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/patches/features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch)
@@ -0,0 +1,37 @@
+From: Ping Cheng <pinglinux at gmail.com>
+Date: Sun, 24 Jun 2012 23:00:29 -0500
+Subject: wacom: leave touch_max as is if predefined
+Bug-Debian: http://bugs.debian.org/677164
+
+Another fixup to f393ee2b814e (Input: wacom - retrieve maximum number
+of touch points, 2012-04-29).  The 0xE6 tablet in the Thinkpad x220t
+reports the wrong value for MAXCONTACTS so the hardcoded value must
+take precedence.
+
+[jn: extracted from a larger commit in the input-wacom repository,
+ with new description]
+
+Signed-off-by: Ping Cheng <pingc at wacom.com>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+---
+ drivers/input/tablet/wacom_sys.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
+index 6b1cd71ba320..8b31473a81fe 100644
+--- a/drivers/input/tablet/wacom_sys.c
++++ b/drivers/input/tablet/wacom_sys.c
+@@ -401,7 +401,9 @@ static int wacom_parse_hid(struct usb_interface *intf,
+ 				break;
+ 
+ 			case HID_USAGE_CONTACTMAX:
+-				wacom_retrieve_report_data(intf, features);
++				/* leave touch_max as is if predefined */
++				if (!features->touch_max)
++					wacom_retrieve_report_data(intf, features);
+ 				i++;
+ 				break;
+ 			}
+-- 
+1.7.11.rc3
+

Copied: dists/trunk/linux/debian/patches/features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch (from r19210, dists/sid/linux/debian/patches/features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/patches/features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch)
@@ -0,0 +1,37 @@
+From: Ping Cheng <pinglinux at gmail.com>
+Date: Sun, 24 Jun 2012 23:29:29 -0500
+Subject: wacom: do not request tablet data on MT Tablet PC pen interface
+Bug-Debian: http://bugs.debian.org/677164
+
+When in commit 1963518b9b1b (Input: wacom - add 0xE5 (MT device)
+support, 2012-04-29) the driver stopped asking for multitouch tablet
+data on the pen interface of a tablet PC, as a side effect we started
+executing the "else" to that if statement.  Oops.
+
+This is needed for the 0xE6 tablet in the Thinkpad x220t to be usable
+again.  Meanwhile the 0xE3 works fine without this.  Not sure why. -jn
+
+[jn: extracted from a larger commit in the input-wacom repository,
+ with new description]
+
+Signed-off-by: Ping Cheng <pingc at wacom.com>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+---
+ drivers/input/tablet/wacom_sys.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
+index 8b31473a81fe..19e4725858dd 100644
+--- a/drivers/input/tablet/wacom_sys.c
++++ b/drivers/input/tablet/wacom_sys.c
+@@ -467,6 +467,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat
+ 		}
+ 	} else if (features->type != TABLETPC &&
+ 		   features->type != WIRELESS &&
++		   features->type != TABLETPC2FG &&
+ 		   features->device_type == BTN_TOOL_PEN) {
+ 		do {
+ 			rep_data[0] = 2;
+-- 
+1.7.11.rc3
+

Copied: dists/trunk/linux/debian/patches/features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch (from r19210, dists/sid/linux/debian/patches/features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/patches/features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch)
@@ -0,0 +1,50 @@
+From: Ping Cheng <pinglinux at gmail.com>
+Date: Sun, 24 Jun 2012 23:44:46 -0500
+Subject: wacom: ignore new-style Wacom multi touch packets on MT Tablet PC
+Bug-Debian: http://bugs.debian.org/677164
+
+Tablets such as 0xE6 (Thinkpad x220t) already worked fine before
+adding support for the new packet format, so let's drop the
+functionality for such devices for now.  Meanwhile 0xE5 can still use
+the new packet format.
+
+This should bring the behavior of TABLETPC2FG devices closer to that
+from before 1963518b9b1b (Input: wacom - add 0xE5 (MT device) support,
+2012-04-29).
+
+[jn: extracted from a larger commit in the input-wacom repository,
+ with new description]
+
+Signed-off-by: Ping Cheng <pingc at wacom.com>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+---
+ drivers/input/tablet/wacom_wac.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
+index 004bc1bb1544..d696ab7ecc2b 100644
+--- a/drivers/input/tablet/wacom_wac.c
++++ b/drivers/input/tablet/wacom_wac.c
+@@ -1547,7 +1547,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
+ 		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
+ 		break;
+ 
+-	case TABLETPC2FG:
+ 	case MTSCREEN:
+ 		if (features->device_type == BTN_TOOL_FINGER) {
+ 
+@@ -1559,6 +1558,11 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
+ 
+ 			for (i = 0; i < features->touch_max; i++)
+ 				wacom_wac->slots[i] = -1;
++		}
++		/* fall through */
++
++	case TABLETPC2FG:
++		if (features->device_type == BTN_TOOL_FINGER) {
+ 
+ 			input_mt_init_slots(input_dev, features->touch_max);
+ 			input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
+-- 
+1.7.11.rc3
+

Copied: dists/trunk/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch (from r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch)
@@ -0,0 +1,285 @@
+commit c06cd9bfcad4960023bac1f052da748824e24961
+Author: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
+Date:   Wed Apr 18 23:16:41 2012 +0200
+
+    kirkwood: Add iconnect support
+    
+    Add support for Iomega Iconnect system.
+    
+    Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+    Tested-By: Adam Baker <linux at baker-net.org.uk>
+    Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+
+Index: sid/arch/arm/boot/dts/kirkwood-iconnect.dts
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ sid/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-06-10 01:24:28.300087489 +0200
+@@ -0,0 +1,26 @@
++/dts-v1/;
++
++/include/ "kirkwood.dtsi"
++
++/ {
++	model = "Iomega Iconnect";
++	compatible = "iom,iconnect-1.1", "iom,iconnect", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
++
++	memory {
++		device_type = "memory";
++		reg = <0x00000000 0x10000000>;
++	};
++
++	chosen {
++		bootargs = "console=ttyS0,115200n8 earlyprintk mtdparts=orion_nand:0xc0000 at 0x0(uboot),0x20000 at 0xa0000(env),0x300000 at 0x100000(zImage),0x300000 at 0x540000(initrd),0x1f400000 at 0x980000(boot)";
++		linux,initrd-start = <0x4500040>;
++		linux,initrd-end   = <0x4800000>;
++	};
++
++	ocp at f1000000 {
++		serial at 12000 {
++			clock-frequency = <200000000>;
++			status = "ok";
++		};
++	};
++};
+Index: sid/arch/arm/mach-kirkwood/Kconfig
+===================================================================
+--- sid.orig/arch/arm/mach-kirkwood/Kconfig	2012-06-10 01:13:01.000000000 +0200
++++ sid/arch/arm/mach-kirkwood/Kconfig	2012-06-10 01:24:28.300087489 +0200
+@@ -58,6 +58,12 @@ config MACH_DREAMPLUG_DT
+ 	  Say 'Y' here if you want your kernel to support the
+ 	  Marvell DreamPlug (Flattened Device Tree).
+ 
++config MACH_ICONNECT_DT
++	bool "Iomega Iconnect (Flattened Device Tree)"
++	select ARCH_KIRKWOOD_DT
++	help
++	  Say 'Y' here to enable Iomega Iconnect support.
++
+ config MACH_TS219
+ 	bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
+ 	help
+Index: sid/arch/arm/mach-kirkwood/Makefile
+===================================================================
+--- sid.orig/arch/arm/mach-kirkwood/Makefile	2012-06-10 01:13:58.000000000 +0200
++++ sid/arch/arm/mach-kirkwood/Makefile	2012-06-10 01:24:28.300087489 +0200
+@@ -22,3 +22,4 @@ obj-$(CONFIG_MACH_T5325)		+= t5325-setup
+ obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
+ obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o
+ obj-$(CONFIG_MACH_DREAMPLUG_DT)		+= board-dreamplug.o
++obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o
+Index: sid/arch/arm/mach-kirkwood/Makefile.boot
+===================================================================
+--- sid.orig/arch/arm/mach-kirkwood/Makefile.boot	2012-06-10 01:13:01.000000000 +0200
++++ sid/arch/arm/mach-kirkwood/Makefile.boot	2012-06-10 01:24:28.300087489 +0200
+@@ -3,3 +3,4 @@ params_phys-y	:= 0x00000100
+ initrd_phys-y	:= 0x00800000
+ 
+ dtb-$(CONFIG_MACH_DREAMPLUG_DT) += kirkwood-dreamplug.dtb
++dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
+Index: sid/arch/arm/mach-kirkwood/board-dt.c
+===================================================================
+--- sid.orig/arch/arm/mach-kirkwood/board-dt.c	2012-06-10 01:14:30.000000000 +0200
++++ sid/arch/arm/mach-kirkwood/board-dt.c	2012-06-10 01:24:28.300087489 +0200
+@@ -56,11 +56,15 @@ static void __init kirkwood_dt_init(void
+ 	if (of_machine_is_compatible("globalscale,dreamplug"))
+ 		dreamplug_init();
+ 
++	if (of_machine_is_compatible("iom,iconnect"))
++		iconnect_init();
++
+ 	of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
+ }
+ 
+ static const char *kirkwood_dt_board_compat[] = {
+ 	"globalscale,dreamplug",
++	"iom,iconnect",
+ 	NULL
+ };
+ 
+Index: sid/arch/arm/mach-kirkwood/board-iconnect.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ sid/arch/arm/mach-kirkwood/board-iconnect.c	2012-06-10 01:24:28.300087489 +0200
+@@ -0,0 +1,165 @@
++/*
++ * arch/arm/mach-kirkwood/board-iconnect.c
++ *
++ * Iomega i-connect Board Setup
++ *
++ * This file is licensed under the terms of the GNU General Public
++ * License version 2.  This program is licensed "as is" without any
++ * warranty of any kind, whether express or implied.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/of.h>
++#include <linux/of_address.h>
++#include <linux/of_fdt.h>
++#include <linux/of_irq.h>
++#include <linux/of_platform.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mv643xx_eth.h>
++#include <linux/gpio.h>
++#include <linux/leds.h>
++#include <linux/spi/flash.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/orion_spi.h>
++#include <linux/i2c.h>
++#include <linux/input.h>
++#include <linux/gpio_keys.h>
++#include <asm/mach/arch.h>
++#include <mach/kirkwood.h>
++#include "common.h"
++#include "mpp.h"
++
++static struct mv643xx_eth_platform_data iconnect_ge00_data = {
++	.phy_addr	= MV643XX_ETH_PHY_ADDR(11),
++};
++
++static struct gpio_led iconnect_led_pins[] = {
++	{
++		.name		= "led_level",
++		.gpio		= 41,
++		.default_trigger = "default-on",
++	}, {
++		.name		= "power:blue",
++		.gpio		= 42,
++		.default_trigger = "timer",
++	}, {
++		.name		= "power:red",
++		.gpio		= 43,
++	}, {
++		.name		= "usb1:blue",
++		.gpio		= 44,
++	}, {
++		.name		= "usb2:blue",
++		.gpio		= 45,
++	}, {
++		.name		= "usb3:blue",
++		.gpio		= 46,
++	}, {
++		.name		= "usb4:blue",
++		.gpio		= 47,
++	}, {
++		.name		= "otb:blue",
++		.gpio		= 48,
++	},
++};
++
++static struct gpio_led_platform_data iconnect_led_data = {
++	.leds		= iconnect_led_pins,
++	.num_leds	= ARRAY_SIZE(iconnect_led_pins),
++	.gpio_blink_set	= orion_gpio_led_blink_set,
++};
++
++static struct platform_device iconnect_leds = {
++	.name	= "leds-gpio",
++	.id	= -1,
++	.dev	= {
++		.platform_data	= &iconnect_led_data,
++	}
++};
++
++static unsigned int iconnect_mpp_config[] __initdata = {
++	MPP12_GPIO,
++	MPP35_GPIO,
++	MPP41_GPIO,
++	MPP42_GPIO,
++	MPP43_GPIO,
++	MPP44_GPIO,
++	MPP45_GPIO,
++	MPP46_GPIO,
++	MPP47_GPIO,
++	MPP48_GPIO,
++	0
++};
++
++static struct i2c_board_info __initdata iconnect_board_info[] = {
++	{
++		I2C_BOARD_INFO("lm63", 0x4c),
++	},
++};
++
++static struct mtd_partition iconnect_nand_parts[] = {
++	{
++		.name = "flash",
++		.offset = 0,
++		.size = MTDPART_SIZ_FULL,
++	},
++};
++
++/* yikes... theses are the original input buttons */
++/* but I'm not convinced by the sw event choices  */
++static struct gpio_keys_button iconnect_buttons[] = {
++	{
++		.type		= EV_SW,
++		.code		= SW_LID,
++		.gpio		= 12,
++		.desc		= "Reset Button",
++		.active_low	= 1,
++		.debounce_interval = 100,
++	}, {
++		.type		= EV_SW,
++		.code		= SW_TABLET_MODE,
++		.gpio		= 35,
++		.desc		= "OTB Button",
++		.active_low	= 1,
++		.debounce_interval = 100,
++	},
++};
++
++static struct gpio_keys_platform_data iconnect_button_data = {
++	.buttons	= iconnect_buttons,
++	.nbuttons	= ARRAY_SIZE(iconnect_buttons),
++};
++
++static struct platform_device iconnect_button_device = {
++	.name		= "gpio-keys",
++	.id		= -1,
++	.num_resources	= 0,
++	.dev        = {
++		.platform_data  = &iconnect_button_data,
++	},
++};
++
++void __init iconnect_init(void)
++{
++	kirkwood_mpp_conf(iconnect_mpp_config);
++	kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
++	kirkwood_i2c_init();
++	i2c_register_board_info(0, iconnect_board_info,
++		ARRAY_SIZE(iconnect_board_info));
++
++	kirkwood_ehci_init();
++	kirkwood_ge00_init(&iconnect_ge00_data);
++
++	platform_device_register(&iconnect_button_device);
++	platform_device_register(&iconnect_leds);
++}
++
++static int __init iconnect_pci_init(void)
++{
++	if (of_machine_is_compatible("iom,iconnect"))
++		kirkwood_pcie_init(KW_PCIE0);
++	return 0;
++}
++subsys_initcall(iconnect_pci_init);
+Index: sid/arch/arm/mach-kirkwood/common.h
+===================================================================
+--- sid.orig/arch/arm/mach-kirkwood/common.h	2012-06-10 01:14:15.000000000 +0200
++++ sid/arch/arm/mach-kirkwood/common.h	2012-06-10 01:24:28.300087489 +0200
+@@ -58,6 +58,12 @@ void dreamplug_init(void);
+ static inline void dreamplug_init(void) {};
+ #endif
+ 
++#ifdef CONFIG_MACH_ICONNECT_DT
++void iconnect_init(void);
++#else
++static inline void iconnect_init(void) {};
++#endif
++
+ /* early init functions not converted to fdt yet */
+ char *kirkwood_id(void);
+ void kirkwood_l2_init(void);

Copied: dists/trunk/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch (from r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch)
@@ -0,0 +1,116 @@
+commit ff3e660b5a881b401b2b6735aa5334f433237dcb
+Author: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
+Date:   Wed Apr 18 23:16:40 2012 +0200
+
+    orion/kirkwood: create a generic function for gpio led blinking
+    
+    dns323 and (at least) iconnect platforms are using hw led blinking, so,
+    instead of having 2 identicals .gpio_blink_set gpio-led hooks, move
+    dns323 code into gpio.c
+    
+    Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+    Tested-By: Adam Baker <linux at baker-net.org.uk>
+    Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+
+diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
+index c3ed15b..13d2bec 100644
+--- a/arch/arm/mach-orion5x/dns323-setup.c
++++ b/arch/arm/mach-orion5x/dns323-setup.c
+@@ -253,27 +253,6 @@ error_fail:
+  * GPIO LEDs (simple - doesn't use hardware blinking support)
+  */
+ 
+-#define ORION_BLINK_HALF_PERIOD 100 /* ms */
+-
+-static int dns323_gpio_blink_set(unsigned gpio, int state,
+-	unsigned long *delay_on, unsigned long *delay_off)
+-{
+-
+-	if (delay_on && delay_off && !*delay_on && !*delay_off)
+-		*delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
+-
+-	switch(state) {
+-	case GPIO_LED_NO_BLINK_LOW:
+-	case GPIO_LED_NO_BLINK_HIGH:
+-		orion_gpio_set_blink(gpio, 0);
+-		gpio_set_value(gpio, state);
+-		break;
+-	case GPIO_LED_BLINK:
+-		orion_gpio_set_blink(gpio, 1);
+-	}
+-	return 0;
+-}
+-
+ static struct gpio_led dns323ab_leds[] = {
+ 	{
+ 		.name = "power:blue",
+@@ -312,13 +291,13 @@ static struct gpio_led dns323c_leds[] = {
+ static struct gpio_led_platform_data dns323ab_led_data = {
+ 	.num_leds	= ARRAY_SIZE(dns323ab_leds),
+ 	.leds		= dns323ab_leds,
+-	.gpio_blink_set = dns323_gpio_blink_set,
++	.gpio_blink_set = orion_gpio_led_blink_set,
+ };
+ 
+ static struct gpio_led_platform_data dns323c_led_data = {
+ 	.num_leds	= ARRAY_SIZE(dns323c_leds),
+ 	.leds		= dns323c_leds,
+-	.gpio_blink_set = dns323_gpio_blink_set,
++	.gpio_blink_set = orion_gpio_led_blink_set,
+ };
+ 
+ static struct platform_device dns323_gpio_leds = {
+diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
+index d3401e7..af95af2 100644
+--- a/arch/arm/plat-orion/gpio.c
++++ b/arch/arm/plat-orion/gpio.c
+@@ -16,6 +16,7 @@
+ #include <linux/bitops.h>
+ #include <linux/io.h>
+ #include <linux/gpio.h>
++#include <linux/leds.h>
+ 
+ /*
+  * GPIO unit register offsets.
+@@ -295,6 +296,28 @@ void orion_gpio_set_blink(unsigned pin, int blink)
+ }
+ EXPORT_SYMBOL(orion_gpio_set_blink);
+ 
++#define ORION_BLINK_HALF_PERIOD 100 /* ms */
++
++int orion_gpio_led_blink_set(unsigned gpio, int state,
++	unsigned long *delay_on, unsigned long *delay_off)
++{
++
++	if (delay_on && delay_off && !*delay_on && !*delay_off)
++		*delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
++
++	switch (state) {
++	case GPIO_LED_NO_BLINK_LOW:
++	case GPIO_LED_NO_BLINK_HIGH:
++		orion_gpio_set_blink(gpio, 0);
++		gpio_set_value(gpio, state);
++		break;
++	case GPIO_LED_BLINK:
++		orion_gpio_set_blink(gpio, 1);
++	}
++	return 0;
++}
++EXPORT_SYMBOL_GPL(orion_gpio_led_blink_set);
++
+ 
+ /*****************************************************************************
+  * Orion GPIO IRQ
+diff --git a/arch/arm/plat-orion/include/plat/gpio.h b/arch/arm/plat-orion/include/plat/gpio.h
+index 3abf304..bec0c98 100644
+--- a/arch/arm/plat-orion/include/plat/gpio.h
++++ b/arch/arm/plat-orion/include/plat/gpio.h
+@@ -19,6 +19,8 @@
+  */
+ void orion_gpio_set_unused(unsigned pin);
+ void orion_gpio_set_blink(unsigned pin, int blink);
++int orion_gpio_led_blink_set(unsigned gpio, int state,
++	unsigned long *delay_on, unsigned long *delay_off);
+ 
+ #define GPIO_INPUT_OK		(1 << 0)
+ #define GPIO_OUTPUT_OK		(1 << 1)

Copied: dists/trunk/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch (from r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch	Tue Jun 26 06:02:51 2012	(r19211, copy of r19210, dists/sid/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch)
@@ -0,0 +1,29 @@
+commit 92a486eabefadca1169fbf15d737feeaf2bda844
+Author: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
+Date:   Wed Apr 18 23:16:39 2012 +0200
+
+    kirkwood/orion: fix orion_gpio_set_blink
+    
+    gpio registers are for 32 gpios. Given that orion_gpio_set_blink is called
+    directly and not through gpiolib, it needs to make sure that the pin value
+    given to the internal functions are between 0 and 31.
+    
+    Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+    Tested-By: Adam Baker <linux at baker-net.org.uk>
+    Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+
+diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
+index 10d1608..d3401e7 100644
+--- a/arch/arm/plat-orion/gpio.c
++++ b/arch/arm/plat-orion/gpio.c
+@@ -289,8 +289,8 @@ void orion_gpio_set_blink(unsigned pin, int blink)
+ 		return;
+ 
+ 	spin_lock_irqsave(&ochip->lock, flags);
+-	__set_level(ochip, pin, 0);
+-	__set_blinking(ochip, pin, blink);
++	__set_level(ochip, pin & 31, 0);
++	__set_blinking(ochip, pin & 31, blink);
+ 	spin_unlock_irqrestore(&ochip->lock, flags);
+ }
+ EXPORT_SYMBOL(orion_gpio_set_blink);

Copied and modified: dists/trunk/linux/debian/patches/features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch (from r19210, dists/sid/linux/debian/patches/features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch)
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch	Tue Jun 26 05:31:17 2012	(r19210, copy source)
+++ dists/trunk/linux/debian/patches/features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch	Tue Jun 26 06:02:51 2012	(r19211)
@@ -1,7 +1,8 @@
-From e47b65b032f2997aa0a7392ecdf656c86d4d7561 Mon Sep 17 00:00:00 2001
 From: Sam Ravnborg <sam at ravnborg.org>
 Date: Mon, 21 May 2012 20:45:37 +0200
-Subject: [PATCH] net: drop NET dependency from HAVE_BPF_JIT
+Subject: net: drop NET dependency from HAVE_BPF_JIT
+
+commit e47b65b032f2997aa0a7392ecdf656c86d4d7561 upstream.
 
 There is no point having the NET dependency on the select target, as it
 forces all users to depend on NET to tell they support BPF_JIT.  Move
@@ -23,25 +24,21 @@
  net/Kconfig          |    7 ++++---
  5 files changed, 8 insertions(+), 7 deletions(-)
 
-Index: linux/arch/arm/Kconfig
-===================================================================
---- linux.orig/arch/arm/Kconfig	2012-06-24 23:41:24.000000000 +0200
-+++ linux/arch/arm/Kconfig	2012-06-24 23:49:03.000000000 +0200
-@@ -30,7 +30,7 @@
- 	select HAVE_SPARSE_IRQ
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -33,7 +33,7 @@
  	select GENERIC_IRQ_SHOW
  	select CPU_PM if (SUSPEND || CPU_IDLE)
+ 	select GENERIC_PCI_IOMAP
 -	select HAVE_BPF_JIT if NET
 +	select HAVE_BPF_JIT
  	help
  	  The ARM series is a line of low-power-consumption RISC chip designs
  	  licensed by ARM Ltd and targeted at embedded applications and
-Index: linux/arch/powerpc/Kconfig
-===================================================================
---- linux.orig/arch/powerpc/Kconfig	2012-06-20 00:18:30.000000000 +0200
-+++ linux/arch/powerpc/Kconfig	2012-06-24 23:49:03.000000000 +0200
-@@ -134,7 +134,7 @@
- 	select GENERIC_IRQ_SHOW_LEVEL
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -141,7 +141,7 @@
+ 	select IRQ_FORCED_THREADING
  	select HAVE_RCU_TABLE_FREE if SMP
  	select HAVE_SYSCALL_TRACEPOINTS
 -	select HAVE_BPF_JIT if (PPC64 && NET)
@@ -49,11 +46,9 @@
  	select HAVE_ARCH_JUMP_LABEL
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  
-Index: linux/arch/x86/Kconfig
-===================================================================
---- linux.orig/arch/x86/Kconfig	2012-06-23 17:09:51.000000000 +0200
-+++ linux/arch/x86/Kconfig	2012-06-24 23:49:03.000000000 +0200
-@@ -72,7 +72,7 @@
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -77,7 +77,7 @@
  	select GENERIC_CLOCKEVENTS_MIN_ADJUST
  	select IRQ_FORCED_THREADING
  	select USE_GENERIC_SMP_HELPERS if SMP
@@ -61,13 +56,11 @@
 +	select HAVE_BPF_JIT if X86_64
  	select CLKEVT_I8253
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
- 
-Index: linux/net/Kconfig
-===================================================================
---- linux.orig/net/Kconfig	2012-06-20 00:18:30.000000000 +0200
-+++ linux/net/Kconfig	2012-06-24 23:49:03.000000000 +0200
-@@ -232,9 +232,6 @@
- 	depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
+ 	select GENERIC_IOMAP
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -246,9 +246,6 @@
+ 	select DQL
  	default y
  
 -config HAVE_BPF_JIT
@@ -76,7 +69,7 @@
  config BPF_JIT
  	bool "enable BPF Just In Time compiler"
  	depends on HAVE_BPF_JIT
-@@ -326,3 +323,7 @@
+@@ -340,3 +337,7 @@
  
  
  endif   # if NET

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/patches/series	Tue Jun 26 06:02:51 2012	(r19211)
@@ -57,6 +57,10 @@
 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
+features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch
+features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch
+features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch
+features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch
 
 # Update be2net driver to 3.5ish
 features/all/be2net/0043-be2net-fix-ethtool-get-settings.patch
@@ -99,3 +103,11 @@
 
 bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch
 bugfix/x86/zsmalloc-Finish-conversion-to-a-separate-module.patch
+
+features/all/cpu-devices/Partially-revert-cpufreq-Add-support-for-x86-cpuinfo.patch
+
+features/arm/kirkwood-fix-orion_gpio_set_blink.patch
+features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch
+features/arm/kirkwood-add-iconnect-support.patch
+
+features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch

Modified: dists/trunk/linux/debian/rules
==============================================================================
--- dists/trunk/linux/debian/rules	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/rules	Tue Jun 26 06:02:51 2012	(r19211)
@@ -32,10 +32,18 @@
 	$(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH)
 	@$(stamp)
 
-build: debian/control $(STAMPS_DIR)/build-base
-$(STAMPS_DIR)/build-base: $(STAMPS_DIR)/setup-base
+build: build-arch build-indep
+
+build-arch: debian/control $(STAMPS_DIR)/build-arch-base
+$(STAMPS_DIR)/build-arch-base: $(STAMPS_DIR)/setup-base
+	dh_testdir
+	$(MAKE) -f debian/rules.gen build-arch_$(DEB_HOST_ARCH)
+	@$(stamp)
+
+build-indep: debian/control $(STAMPS_DIR)/build-indep-base
+$(STAMPS_DIR)/build-indep-base: $(STAMPS_DIR)/setup-base
 	dh_testdir
-	$(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
+	$(MAKE) -f debian/rules.gen build-indep
 	@$(stamp)
 
 DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
@@ -63,11 +71,11 @@
 	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
+binary-indep: $(STAMPS_DIR)/build-indep-base
 	dh_testdir
 	$(MAKE) -f debian/rules.gen binary-indep
 
-binary-arch: $(STAMPS_DIR)/build-base
+binary-arch: $(STAMPS_DIR)/build-arch-base
 	dh_testdir
 	$(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
 

Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/rules.real	Tue Jun 26 06:02:51 2012	(r19211)
@@ -53,7 +53,8 @@
 binary-indep: install-source
 binary-indep: install-support
 
-build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+build-arch: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+build-indep: $(STAMPS_DIR)/build-doc
 
 setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
@@ -370,13 +371,21 @@
 	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
 	+$(MAKE_SELF) install-base
 
-install-image_armel_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_armhf_$(FEATURESET)_$(FLAVOUR)_plain_image \
 install-image_sparc_$(FEATURESET)_$(FLAVOUR)_plain_image \
 install-image_sparc64_$(FEATURESET)_$(FLAVOUR)_plain_image \
 install-image_sh4_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/zImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
+ifneq ($(filter armel armhf,$(ARCH)),)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image: DTB_INSTALL_DIR = /usr/lib/linux-image-$(REAL_VERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image:
+	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/zImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+	+$(MAKE_CLEAN) -C $(DIR) dtbs
+	shopt -s nullglob ; for i in $(DIR)/arch/arm/boot/*.dtb ; do \
+		install -D -m644 $$i '$(PACKAGE_DIR)'/'$(DTB_INSTALL_DIR)'/$$(basename $$i) ; \
+	done
+endif
+
 install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \
 install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)

Modified: dists/trunk/linux/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/trunk/linux/debian/templates/control.image.type-plain.in	Tue Jun 26 05:31:17 2012	(r19210)
+++ dists/trunk/linux/debian/templates/control.image.type-plain.in	Tue Jun 26 06:02:51 2012	(r19211)
@@ -3,7 +3,7 @@
 Pre-Depends: debconf | debconf-2.0
 Depends: kmod | module-init-tools, linux-base (>= 3~), ${misc:Depends}
 Recommends: firmware-linux-free (>= 3~)
-Suggests: linux-doc- at version@
+Suggests: linux-doc- at version@, debian-kernel-handbook
 Breaks: at (<< 3.1.12-1+squeeze1)
 Description: Linux @upstreamversion@ for @class@
  The Linux kernel @upstreamversion@ and modules for use on @longclass at .

