[kernel] r16903 - in dists/trunk/linux-2.6: . debian debian/bin debian/config debian/config/amd64 debian/config/armel debian/config/i386 debian/config/ia64 debian/config/kernelarch-x86 debian/config/m68k debian/config/mips debian/config/powerpc debian/config/s390 debian/lib/python/debian_linux debian/templates

Bastian Blank waldi at alioth.debian.org
Wed Feb 16 17:06:14 UTC 2011


Author: waldi
Date: Wed Feb 16 17:06:01 2011
New Revision: 16903

Log:
Merge /dists/squeeze/linux-2.6 (2.6.32-30).

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/defines
   dists/trunk/linux-2.6/debian/config/armel/config
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/config/armel/config.orion5x
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/defines
   dists/trunk/linux-2.6/debian/config/i386/defines
   dists/trunk/linux-2.6/debian/config/ia64/defines
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/m68k/config
   dists/trunk/linux-2.6/debian/config/m68k/config.atari
   dists/trunk/linux-2.6/debian/config/m68k/config.mac
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/s390/defines
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/patches.py
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.main.in

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Wed Feb 16 17:06:01 2011	(r16903)
@@ -124,7 +124,7 @@
         packages['source']['Build-Depends'].extend(relations_compiler_build_dep)
 
         image_fields = {'Description': PackageDescription()}
-        for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts':
+        for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts', 'Breaks':
             image_fields[field] = PackageRelation(config_entry_image.get(field.lower(), None), override_arches=(arch,))
 
         if config_entry_image.get('initramfs', True):
@@ -132,15 +132,31 @@
             config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, featureset, flavour)
             commands = [config_entry_commands_initramfs[i] for i in generators if config_entry_commands_initramfs.has_key(i)]
             makeflags['INITRD_CMD'] = ' '.join(commands)
-            l_depends = PackageRelationGroup()
+            l = PackageRelationGroup()
             for i in generators:
                 i = config_entry_relations.get(i, i)
-                l_depends.append(i)
+                l.append(i)
+                a = PackageRelationEntry(i)
+                if a.operator is not None:
+                    a.operator = -a.operator
+                    image_fields['Breaks'].append(PackageRelationGroup([a]))
+            for item in l:
+                item.arches = [arch]
+            image_fields['Depends'].append(l)
+
+        bootloaders = config_entry_image.get('bootloaders')
+        if bootloaders:
+            l = PackageRelationGroup()
+            for i in bootloaders:
+                i = config_entry_relations.get(i, i)
+                l.append(i)
                 a = PackageRelationEntry(i)
                 if a.operator is not None:
                     a.operator = -a.operator
-                    image_fields['Conflicts'].append(PackageRelationGroup([a]))
-            image_fields['Depends'].append(l_depends)
+                    image_fields['Breaks'].append(PackageRelationGroup([a]))
+            for item in l:
+                item.arches = [arch]
+            image_fields['Suggests'].append(l)
 
         desc_parts = self.config.get_merge('description', arch, featureset, flavour, 'parts')
         if desc_parts:

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Feb 16 17:06:01 2011	(r16903)
@@ -587,6 +587,873 @@
 
  -- maximilian attems <maks at debian.org>  Thu, 25 Feb 2010 15:21:38 +0100
 
+linux-2.6 (2.6.32-30) unstable; urgency=high
+
+  [ Ben Hutchings ]
+  * mpt2sas: Fix incorrect scsi_dma_map error checking (Closes: #606968)
+  * Update Spanish debconf template translation (Omar Campagne, Javier
+    Fernández-Sanguino) (Really closes: #600694)
+  * intel-iommu: Force-disable IOMMU for iGFX on broken Cantiga revisions
+    (Closes: #607095)
+  * [powerpc] linux-base: Run ybin after updating yaboot.conf
+    (Closes: #607284)
+  * tehuti: Firmware filename is tehuti/bdx.bin
+  * iwlwifi: Reduce a failure-prone memory allocation (Closes: #599345)
+  * linux-base: Look for GRUB 1 configuration in both /boot/grub and
+    /boot/boot/grub (Closes: #607863)
+  * rt28x0: Add ieee80211_regdom module parameter mimicking cfg80211 as a
+    workaround for incorrect region code in NVRAM (Closes: #594561)
+  * btrfs: Require CAP_SYS_ADMIN for filesystem rebalance (Closes: #608185)
+  * [x86] dell-laptop: Enable for some newer Dell models
+  * r8169: Change RTL8111D/RTL8168D initialisation and firmware loading to
+    match upstream version (Closes: #596390 with firmware-realtek 0.28)
+  * Add stable 2.6.32.28:
+    - NFS: Fix panic after nfs_umount()
+    - usb-storage/libusual: Add support for Samsung YP-CP3 MP4 Player,
+      thanks to Vitaly Kuznetsov (Closes: #555835)
+    - bfa: Fix system crash when reading sysfs fc_host statistics
+      (CVE-2010-4343)
+    - IB/uverbs: Handle large number of entries in poll CQ (CVE-2010-4649)
+    - orinoco: Fix TKIP countermeasure behaviour (CVE-2010-4648)
+    - mm: Add security_file_mmap check to install_special_mapping
+      (CVE-2010-4346)
+    - sctp: Fix a race between ICMP protocol unreachable and connect()
+      (CVE-2010-4526)
+    - hvc_console: Fix race between hvc_close and hvc_remove (CVE-2010-2653)
+      (previously applied as an isolated fix in 2.6.32-25)
+    - fuse/cuse: Verify ioctl retries (CVE-2010-4650)
+  * [powerpc] Restore device tree source files to linux-image packages
+    (Closes: #609155)
+
+  [ maximilian attems ]
+  * [openvz] Reenable NF_CONNTRACK_IPV6. (closes: #580507)
+  * cifs: fix another memleak, in cifs_root_iget.
+  * b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd.
+  * drm/radeon/kms: MC vram map needs to be >= pci aperture size.
+  * drm/radeon/kms: make sure blit addr masks are 64 bit.
+  * drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx.
+  * drm/i915: Free hardware status page on unload when physically mapped.
+  * drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.
+  * drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode().
+  * drm/radeon/kms: fix typos in disabled vbios code.
+  * drm/radeon/kms: add workaround for dce3 ddc line vbios bug.
+  * drm/radeon/kms: fix interlaced and doublescan handling.
+  * drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable.
+  * wireless: b43: fix error path in SDIO.
+  * drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP.
+
+  [ Ian Campbell ]
+  * xen: backport TTM patches to use PCI API. Fixes PCIe GPU (specifically
+    Radeon and Nouveau) on Xen (Closes: #601341).
+  * xen: netback: drop SKBs which are GSO but do not have a partial
+    checksum set (Closes: #608144).
+
+  [ dann frazier ]
+  * exec: make argv/envp memory visible to oom-killer (CVE-2010-4243)
+  * irda: Fix information leak in IRLMP_ENUMDEVICES (CVE-2010-4529)
+  * af_unix: limit unix_tot_inflight (CVE-2010-4249)
+
+  [ Moritz Muehlenhoff ]
+  * net: ax25: fix information leak to userland (CVE-2010-3875)
+  * net: packet: fix information leak to userland (CVE-2010-3876)	
+  * net: tipc: fix information leak to userland (CVE-2010-3877)
+  * inet_diag: Make sure we actually run the same bytecode we audited
+    (CVE-2010-3880)
+  * econet: Fix crash in aun_incoming() (CVE-2010-4342)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 11 Jan 2011 05:42:11 +0000
+
+linux-2.6 (2.6.32-29) unstable; urgency=high
+
+  [ Ben Hutchings ]
+  * megaraid_sas: Add support for 'entry-level' SAS controllers including
+    the 9240 family (Closes: #604083)
+  * tcp: Make TCP_MAXSEG minimum more correct (refinement of fix for
+    CVE-2010-4165)
+  * l2tp: Fix UDP socket reference count bugs in the pppol2tp driver
+    (Closes: #604748)
+  * USB: Retain device power/wakeup setting across reconfiguration;
+    don't enable remote wakeup by default (Closes: #605246)
+  * dm: Deal with merge_bvec_fn in component devices better (Closes: #604457)
+  * Update Spanish debconf template translation (Aaron H Farias Martinez)
+    (Closes: #600694)
+  * perf: Use libiberty, not libbfd, for symbol demangling
+    (Closes: #590226, #606050)
+  * [x86] Add support for Fintek hardware watchdogs (Closes: #601187)
+    - resource: Add shared I/O region support
+    - hwmon: f71882fg: Use a muxed resource lock for the Super I/O port
+    - watchdog: Add f71808e_wdt driver
+  * bcm5974: Add reporting of multitouch events (Closes: #605450)
+  * fusion: Set FUSION_MAX_SGE=128, the upstream default (Closes: #606096)
+  * Add stable 2.6.32.27:
+    - block: limit vec count in bio_kmalloc() and bio_alloc_map_data()
+    - block: take care not to overflow when calculating total iov length
+    - block: check for proper length of iov entries in blk_rq_map_user_iov()
+      (CVE-2010-4163)
+    - net: clear heap allocation for ETHTOOL_GRXCLSRLALL (CVE-2010-3861)
+    - asus_oled: fix up some sysfs attribute permissions
+    - ipc: initialize structure memory to zero for compat functions
+      (CVE-2010-4073)
+    - ipc/shm: fix information leak to userland (CVE-2010-4072)
+    - ipc/sem: sys_semctl: fix kernel stack information leakage (CVE-2010-4083)
+    - tty: prevent DOS in the flush_to_ldisc
+    - [x86] KVM: VMX: Fix host userspace gsbase corruption (Closes: #604956)
+    - KVM: VMX: fix vmx null pointer dereference on debug register access
+      (CVE-2010-0435)
+    - KVM: x86: fix information leak to userland (CVE-2010-3881)
+    - firewire/cdev: fix information leak
+    - firewire-core: fix an information leak
+    - firewire-ohci: fix buffer overflow in AR split packet handling
+    - bio: take care not overflow page count when mapping/copying user data
+      (CVE-2010-4162)
+    - sisusbvga: fix information leak to userland
+    - iowarrior: fix information leak to userland
+    - usb: core: fix information leak to userland
+    - usb-storage/sierra_ms: fix sysfs file attribute
+    - ueagle-atm: fix up some permissions on the sysfs files
+    - cypress_cy7c63: fix up some sysfs attribute permissions
+    - usbled: fix up some sysfs attribute permissions
+    - trancevibrator: fix up a sysfs attribute permission
+    - usbsevseg: fix up some sysfs attribute permissions
+    - do_exit(): make sure that we run with get_fs() == USER_DS (CVE-2010-4258)
+    - DECnet: don't leak uninitialized stack byte
+    - perf_events: Fix perf_counter_mmap() hook in mprotect() (CVE-2010-4169)
+    - frontier: fix up some sysfs attribute permissions
+    - net/sched: fix kernel information leak in act_police
+    - can-bcm: fix minor heap overflow (CVE-2010-3874)
+    - ivtvfb: prevent reading uninitialized stack memory (CVE-2010-4079)
+    - net/sched: fix some kernel information leaks
+  * TTY: Fix error return from tty_ldisc_open() (regression in 2.6.32.27)
+  * filter: make sure filters dont read uninitialized memory (CVE-2010-4158)
+  * posix-cpu-timers: workaround to suppress the problems with mt exec
+    (CVE-2010-4248)
+
+  [ Ian Campbell ]
+  * xen: disable ACPI NUMA for PV guests and allow IRQ desc allocation on any
+    node (Closes: #603632)
+  * xen: handle potential time discontinuity on resume (Closes: #602273)
+  * xen: don't bother to stop other cpus on shutdown/reboot (Closes: #605448)
+  * xen: Add cpu hotplug support to prevent crash while parsing ACPI processor
+    tables (Closes: #602109)
+
+  [ Martin Michlmayr ]
+  * Kirkwood: Add support for 6282 based QNAP devices.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 10 Dec 2010 05:45:11 +0000
+
+linux-2.6 (2.6.32-28) unstable; urgency=high
+
+  [ maximilian attems ]
+  * ipc: initialize structure memory to zero for shmctl.
+  * drm/i915: set DIDL using the ACPI video output device _ADR method return.
+  * images: Nuke modules.devname on removal. (closes: #590607)
+  * Newer Standards-Version 3.9.1 without changes.
+  * drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
+  * [openvz] Update upstream patch to 2.6.32-dzhanibekov.
+  * [openvz] ubc: Fix orphan count checks after merge.
+
+  [ Martin Michlmayr ]
+  * Update udlfb to 2.6.37:
+    - udlfb: minor cleanups
+    - udlfb: fix coding style issues
+    - udlfb: fbdev character read and write support
+    - udlfb: add DPMS support
+    - udlfb: remove metrics_misc sysfs attribute
+    - udlfb: revamp reference handling to insure successful shutdown
+    - udlfb: enhance EDID and mode handling support
+    - udlfb: fix big endian rendering error
+    - udlfb: support for writing backup EDID to sysfs file
+    - udlfb: add module options for console and fb_defio
+    - udlfb: fix incorrect fb_defio implementation for multiple framebuffers
+    - udlfb: fix checkpatch and style
+
+  [ Ben Hutchings ]
+  * Update debconf template translations:
+    - Update Japanese (Nobuhiro Iwamatsu) (Closes: #602152)
+    - Update Catalan (Jordi Mallach) (Closes: #602520)
+    - Add Italian (Luca Bruno) (Closes: #602945)
+  * sunrpc: Fix NFS client over TCP hangs due to packet loss (Closes: #589945)
+  * brcm80211: Update to 2.6.37-rc1
+  * [powerpc] ALSA: Fix headphone and line-out detection on PowerMac G4 DA
+    (Closes: #603419)
+  * [x86] snd-hda-codec-cirrus: Add quirks for IMac 27", MacBookPro 5,5 and 7,1
+  * [x86] btusb: Add device IDs for MacBookPro 6,2 and 7,1 (Closes: #603651)
+  * [x86] applesmc: Add support for iMac 9,1 and MacBookPro 2,2, 5,3, 5,4, 6,*
+    and 7,*
+  * [x86] applesmc, bcm5974, btusb, HID, mbp_nvidia_bl, snd-hda-codec-cirrus:
+    Add support for MacBookAir 3,1 and 3,2 (Closes: #603395)
+  * [x86] mbp_nvidia_bl: Add support for MacBookPro 7,1
+  * x25: Fix remote denial-of-service vulnerabilities:
+    - x25 accesses fields beyond end of packet
+    - memory corruption in X.25 facilities parsing (CVE-2010-3873)
+    - Prevent crashing when parsing bad X.25 facilities (CVE-2010-4164)
+  * tcp: Increase TCP_MAXSEG socket option minimum (CVE-2010-4165)
+  * rds: Fix integer overflow in RDS cmsg handling
+  * af_802154,decnet,econet,rds,x25: Disable auto-loading as mitigation
+    against local exploits.  These protocol modules are not widely used
+    and can be explicitly loaded or aliased on systems where they are
+    wanted.
+  * atl1c: Add support for Atheros AR8151 and AR8152 (Closes: #599771)
+  * Add stable 2.6.32.26:
+    - synclink_cs: Fix information leak to userland
+    - bluetooth: Fix missing NULL check
+    - [x86] KVM: VMX: Fix host GDT.LIMIT corruption
+    - [x86] KVM: Fix fs/gs reload oops with invalid ldt (CVE-2010-3698)
+    - gdth: Fix integer overflow in ioctl (CVE-2010-4157)
+  * [x86] KVM: SVM: Fix wrong intercept masks for KVM_{GET,SET}_VCPU_EVENTS
+    on 32 bit, thanks to Philipp Matthias Hahn (Closes: #599507)
+
+  [ dann frazier ]
+  * [vserver] Update patch to 2.6.32.25-vs2.3.0.36.29.6
+  * add qlcnic driver
+  * econet: Avoid stack overflow w/ large msgiovlen (CVE-2010-3848)
+  * econet: disallow NULL remote addr for sendmsg() (CVE-2010-3849)
+  * econet: Add mising CAP_NET_ADMIN check in SIOCSIFADDR (CVE-2010-3850)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 25 Nov 2010 01:20:50 +0000
+
+linux-2.6 (2.6.32-27) unstable; urgency=high
+  
+  * The "We'll Always Have Paris" release
+
+  [ Ben Hutchings ]
+  * rndis_host: Restrict fix for #576929 to specific devices
+    (Closes: #589403, #600660)
+  * Add stable 2.6.32.25:
+    - rme9652: prevent reading uninitialized stack memory
+      (CVE-2010-4080, CVE-2010-4081)
+    - ocfs2: Don't walk off the end of fast symlinks
+    - ip: fix truesize mismatch in ip fragmentation
+    - net: clear heap allocations for privileged ethtool actions
+    - execve: setup_arg_pages: diagnose excessive argument size
+    - execve: improve interactivity with large arguments
+    - execve: make responsive to SIGKILL with large arguments
+    - rose: Fix signedness issues wrt. digi count. (CVE-2010-3310)
+    - ALSA: prevent heap corruption in snd_ctl_new() (CVE-2010-3442)
+    - setup_arg_pages: diagnose excessive argument size (CVE-2010-3858)
+  * btrfs: add a "df" ioctl for btrfs (Closes: #600190)
+  * Update debconf template translations:
+    - Add Catalan (Jordi Mallach) (Closes: #601146)
+    - Add Brazilian Portugese (Flamarion Jorge) (Closes: #601102)
+    - Update Vietnamese (Clytie Siddall) (Closes: #601534)
+  * phonet: device notifier only runs on initial namespace
+    (Really closes: #597904)
+  * net/socket: Limit sendto()/recvfrom() length (CVE-2010-1187)
+    [Original reference is incorrect; should be CVE-2010-3859.]
+
+  [ Ian Campbell ]
+  * xen: import additional fixes for disabling netfront smartpoll mode
+    (Closes: #600992).
+
+  [ dann frazier ]
+  * e1000e: Reset 82577/82578 PHY before first PHY register read
+    (Closes: #601017)
+
+  [ Martin Michlmayr ]
+  * Kirkwood: reset PCIe unit on boot
+  * Kirkwood: restrict the scope of the PCIe reset workaround
+
+  [ maximilian attems ]
+  * Update abi files, readd Xen as ABI stable.
+  * 2.6.33.stable-queue: drm/radeon: fix PCI ID 5657 to be an RV410.
+  * Add drm changes from 2.6.32.24+drm33.11:
+    - i915: return -EFAULT if copy_to_user fails.
+    - drm/i915: Prevent double dpms on
+    - drm: Only decouple the old_fb from the crtc is we call mode_set*
+    - drm/i915: Unset cursor if out-of-bounds upon mode change (v4)
+    - drm/i915,agp/intel: Add second set of PCI-IDs for B43
+  * net: Limit socket I/O iovec total length to INT_MAX. (CVE-2010-1187)
+    [Original reference is incorrect; should be CVE-2010-3859.]
+  * numa: fix slab_node(MPOL_BIND).
+
+ -- maximilian attems <maks at debian.org>  Sat, 30 Oct 2010 12:24:37 +0200
+
+linux-2.6 (2.6.32-26) unstable; urgency=high
+
+  [ Ian Campbell ]
+  * xen: fix PVHVM hang at boot when Xen does not support vector callbacks.
+  * xen: fix race between PV drivers and xenstore initialisation which caused
+    breakage in drivers for both regular PV and PVHVM guests.
+
+  [ maximilian attems ]
+  * [openvz] Enable ioprio. (closes: #596772)
+    Thanks Daniel Hahler <debian-bugs at thequod.de>
+
+  [ Ben Hutchings ]
+  * [x86] radeon: Add quirks to make HP nx6125 and dv5000 laptops resume
+    (Closes: #583968)
+  * dm-crypt: Add 'plain64' IV; this avoids watermarking attacks that are
+    possible with 'plain' IV on devices larger than 2TB (Closes: #600384)
+  * [x86] ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
+    (Closes: #600305)
+  * debian/.../patches.py: Open files as needed, rather than all at once
+    (Closes: #600423)
+  * [openvz] printk: Handle global log buffer reallocation (Closes: #600299)
+  * debian/bin/test-patches: Restrict patches to featureset when building
+    with a featureset (thanks to Tim Small)
+  * sata_via: Delay on vt6420 when starting ATAPI DMA write (Closes: #488566)
+  * r6040: Fix various bugs in r6040_multicast_list() (Closes: #600155)
+
+  [ dann frazier ]
+  * Force enable DMA on MBP w/ MCP 7,1
+  * RDS sockets: remove unsafe kmap_atomic optimization (CVE-2010-3904)
+  * v4l: disable dangerous buggy compat function (CVE-2010-2963)
+
+ -- dann frazier <dannf at debian.org>  Tue, 19 Oct 2010 07:50:55 -0600
+
+linux-2.6 (2.6.32-25) unstable; urgency=high
+
+  [ Ben Hutchings ]
+  * mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
+  * Add stable 2.6.32.24 (trivial fix, already applied)
+  * ipg: Remove device claimed by dl2k from pci id table (Closes: #599021)
+  * linux-image: Include modules.order in image packages (Closes: #598518)
+  * [x86] isdn/i4l: Reenable ISDN4Linux drivers, but mark them as staging
+    (Closes: #588551)
+    - hisax: Disable device aliases that conflict with mISDN
+  * Update Danish debconf template translation (Joe Hansen) (Closes: #599457)
+  * [x86] KVM: SVM: Fix wrong intercept masks on 32 bit (Closes: #599507)
+  * e1000: fix Tx hangs by disabling 64-bit DMA (Closes: #518182)
+  * rt2x00: Fix calculation of required TX headroom (Closes: #599395)
+  * Add drm changes from 2.6.32.22+drm33.10:
+    - i915: Don't touch PORT_HOTPLUG_EN in intel_dp_detect()
+    - i915: Kill dangerous pending-flip debugging
+    - radeon: release AGP bridge at suspend
+    - radeon: initialize set_surface_reg for rs600 asic
+  * [x86] toshiba_acpi: Add full hotkey support (Closes: #599768)
+
+  [ Stephen R. Marenka ]
+  * m68k: fix missing io macros.
+  * m68k: modular swim on mac.
+  * m68k: never build staging drivers on m68k.
+  * m68k: build in rtc class on atari.
+
+  [ Ian Campbell ]
+  * xen: do not truncate machine address on gnttab_copy_grant_page hypercall
+    (Closes: #599089)
+
+  [ dann frazier ]
+  * drm/i915: Sanity check pread/pwrite (CVE-2010-2962)
+  * drm/i915: Rephrase pwrite bounds checking to avoid any potential overflow
+  * GFS2: Fix writing to non-page aligned gfs2_quota structures (CVE-2010-1436)
+  * hvc_console: Fix race between hvc_close and hvc_remove (CVE-2010-2653)
+  * net sched: fix some kernel memory leaks (CVE-2010-2942)
+  * niu: Fix kernel buffer overflow for ETHTOOL_GRXCLSRLALL (CVE-2010-3084)
+  * rose: Fix signedness issues wrt. digi count (CVE-2010-3310)
+  * Fix pktcdvd ioctl dev_minor range check (CVE-2010-3437)
+  * ALSA: prevent heap corruption in snd_ctl_new() (CVE-2010-3442)
+  * net sched: fix kernel leak in act_police (CVE-2010-3477)
+  * sctp: Fix out-of-bounds reading in sctp_asoc_get_hmac() (CVE-2010-3705)
+
+ -- dann frazier <dannf at debian.org>  Thu, 14 Oct 2010 01:08:05 -0600
+
+linux-2.6 (2.6.32-24) unstable; urgency=high
+
+  [ Ben Hutchings ]
+  * speakup: Update to match Debian package version 3.1.5.dfsg.1-1
+  * scsi_dh_emc: Fix mode select request setup (Closes: #591540)
+  * snd-hda-codec-via: Fix syntax error when CONFIG_SND_HDA_POWER_SAVE is
+    disabled (Closes: #597043)
+  * Add stable 2.6.32.22:
+    - [vserver] Revert sched changes since they conflict.
+  * Recommend use of 'make deb-pkg' to build custom kernel packages
+  * [x86] Revert "i915: Blacklist i830, i845, i855 for KMS". The current X
+    driver (xserver-xorg-video-intel version 2.12.0+shadow-1) should work
+    properly with KMS on these chips. (Closes: #596453)
+  * phonet: Restrict to initial namespace (Closes: #597904)
+  * Add stable 2.6.32.23:
+    - serial/mos*: prevent reading uninitialized stack memory
+    - net: Fix oops from tcp_collapse() when using splice()
+    - rds: fix a leak of kernel memory
+    - hso: prevent reading uninitialized memory (CVE-2010-3298)
+    - cxgb3: prevent reading uninitialized stack memory (CVE-2010-3296)
+    - eql: prevent reading uninitialized stack memory (CVE-2010-3297)
+    - vt6655: fix buffer overflow
+    - net/llc: make opt unsigned in llc_ui_setsockopt()
+    - sisfb: prevent reading uninitialized stack memory
+    - aio: check for multiplication overflow in do_io_submit (CVE-2010-3067)
+    - xfs: prevent reading uninitialized stack memory (CVE-2010-3078)
+    - viafb: prevent reading uninitialized stack memory
+    - [hppa,ia64] mm: guard page for stacks that grow upwards (CVE-2010-2240)
+    - sctp: Do not reset the packet during sctp_packet_config()
+      (CVE-2010-3432)
+  * xen: Fix typo in xen_percpu_chip definition
+  * 3c59x: Remove incorrect locking (Closes: #598103)
+  * f71882fg: Add support for the f71889fg (Closes: #597820)
+  * drm/radeon: Fix regressions introduced in 2.6.34.3 (Closes: #597636)
+  * mmc: fix hangs related to mmc/sd card insert/removal during suspend/resume
+    (Closes: #598147)
+
+  [ Martin Michlmayr ]
+  * ARM: update mach types.
+  * [armel/config.kirkwood] Enable MACH_DOCKSTAR.
+
+  [ Ian Campbell ]
+  * [x86/xen] Disable netfront's smartpoll mode by default. (Closes: #596635)
+
+  [ maximilian attems ]
+  * [openvz] Update upstream patch to 2.6.32-dyomin.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Sep 2010 00:46:16 +0100
+
+linux-2.6 (2.6.32-23) unstable; urgency=low
+
+  [ Ben Hutchings ]
+  * cgroupfs: create /sys/fs/cgroup to mount cgroupfs on (Closes: #595964)
+  * r8169: Fix MDIO timing (Closes: #583139; mistakenly reverted in 2.6.32-19)
+  * gro: Fix bogus gso_size on the first fraglist entry (Closes: #596802)
+  * vgaarb: Fix VGA arbiter to accept PCI domains other than 0 (from stable
+    2.6.32.12; mistakenly omitted in 2.6.32-12)
+
+  [ maximilian attems ]
+  * openvz: cfq-iosched: do not force idling for sync workload.
+
+  [ Stephen R. Marenka ]
+  * m68k: switch to generic siginfo layout.
+  * m68k: NPTL support.
+
+  [ dann frazier ]
+  * compat: Make compat_alloc_user_space() incorporate the access_ok()
+    (CVE-2010-3081)
+  * x86-64, compat (CVE-2010-3301):
+    - Retruncate rax after ia32 syscall entry tracing
+    - Test %rax for the syscall number, not %eax
+  * wireless extensions: fix kernel heap content leak (CVE-2010-2955)
+  * KEYS (CVE-2010-2960):
+    - Fix RCU no-lock warning in keyctl_session_to_parent()
+    - Fix bug in keyctl_session_to_parent() if parent has no session keyring
+
+ -- dann frazier <dannf at debian.org>  Fri, 17 Sep 2010 15:27:04 -0600
+
+linux-2.6 (2.6.32-22) unstable; urgency=low
+
+  [ Ian Campbell ]
+  * xen: backport pvhvm drivers from upstream.
+  * Fixes/overrides for Lintian warnings:
+    - Add "(meta package)" to short description of linux-headers
+      metapackages, resolves empty-binary-package.
+    - Add dependency on ${misc:Depends} to all packages, resolves
+      debhelper-but-no-misc-depends. Required update to gencontrol.py to
+      augment rather than override headers_arch_depends read from templates.
+    - Override dbg-package-missing-depends for linux-image-*-dbg. It is not
+      necessary to install the kernel image package to use the dbg package
+      since the dbg package already contains a complete image with symbols.
+
+  [ Ben Hutchings ]
+  * [x86/xen] Restore stack guard page (CVE-2010-2240)
+  * Add stable 2.6.32.21:
+    - ext4: consolidate in_range() definitions (CVE-2010-3015)
+    - mm: make the mlock() stack guard page checks stricter
+      (avoids regression for Xen tools; closes: 594756)
+    - [sparc] sunxvr500: Ignore secondary output PCI devices
+      (Closes: #594604)
+    - ocfs2: fix o2dlm dlm run purgelist (Closes: #593679)
+    - Avoid ABI change in mm
+    - Ignore ABI change in snd-emu10k1
+  * Add drm changes from stable 2.6.34.6:
+    - drm: stop information leak of old kernel stack (CVE-2010-2803)
+  * rt2870sta: Add more device IDs from vendor drivers
+  * rt2860sta, rt2870sta: Enable channels 12-14 (Closes: #594561)
+  * SCSI/mptsas: fix hangs caused by ATA pass-through (Closes: #594690)
+  * sky2: Apply fixes and new hardware support from 2.6.33-2.6.35
+    (Closes: #571526)
+  * postinst: Really warn users on upgrade if the current configuration may
+    rely on running a default boot loader.
+  * input: add compat support for sysfs and /proc capabilities output
+    (Closes: #579017)
+  * snd-hda-intel: Add support for VIA V1708S, VT1718S, VT1828S, VT2020,
+    VT1716S, VT2002P, VT1812, VT1818S
+  * hwmon/w83627ehf: Add support for W83667HG-B
+  * 3c59x: Fix deadlock in vortex_error() (Closes: #595554)
+  * [x86] paravirt: Add a global synchronization point for pvclock (from
+    2.6.32.16; reverted due to a regression which was addressed in 2.6.32.19)
+  * sched, cputime: Introduce thread_group_times() (from 2.6.32.19; reverted
+    due to the potential ABI change which we now carefully avoid)
+  * net/{tcp,udp,llc,sctp,tipc,x25}: Add limit for socket backlog
+    (Closes: #592187)
+  * tun: Don't add sysfs attributes to devices without sysfs directories
+    (Closes: #594845)
+  * [x86] Add brcm80211 driver for Broadcom 802.11n wireless network
+    controllers
+  * r8169: Remove MODULE_FIRMWARE declarations since the firmware is
+    non-essential and we do not distribute it
+  * [x86] HPET: unmap unused I/O space
+  * ipheth: add support for iPhone 4
+  * ipheth: remove incorrect devtype of WWAN
+  * ALSA: emux: Add trivial compat ioctl handler (Closes: #596478)
+  * hostap_pci: set dev->base_addr during probe (Closes: #595802)
+  * ethtool: allow non-netadmin to query settings (see #520724)
+  * ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT, and enable this
+    automatically for known-bad Toshiba models (Closes: #596709)
+
+  [ Bastian Blank ]
+  * Use Breaks instead of Conflicts.
+
+  [ Aurelien Jarno ]
+  * [mips,mipsel] Fix computation of DMA flags from device's 
+    coherent_dma_mask.
+
+  [ Martin Michlmayr ]
+  * Add some patches from the Orion tree:
+    - OpenRD: Enable SD/UART selection for serial port 1
+    - kirkwood: Unbreak PCIe I/O port
+    - Kirkwood: support for Seagate DockStar
+
+  [ dann frazier ]
+  * netxen_nic: add support for loading unified firmware images
+  * irda: Correctly clean up self->ias_obj on irda_bind() failure.
+    (CVE-2010-2954)
+
+  [ maximilian attems ]
+  * [powerpc] Enable WINDFARM_PM121. (closes: #596515)
+    Thanks Étienne BERSAC <bersace03 at gmail.com>
+  * nouveau: disable acceleration on NVA3/NVA5/NVA8 by default.
+  * openvz: disable KSM. Thanks Dietmar Maurer <dietmar at proxmox.com>.
+    (closes: #585864)
+  * Update openvz patch to d38b56fd0dca.
+  * openvz: enalbe modular VZ_EVENT.
+
+ -- maximilian attems <maks at debian.org>  Tue, 14 Sep 2010 14:17:11 +0200
+
+linux-2.6 (2.6.32-21) unstable; urgency=high
+
+  [ Ben Hutchings ]
+  * Add stable 2.6.32.19:
+    - ext4: Make sure the MOVE_EXT ioctl can't overwrite append-only files
+      (CVE-2010-2066)
+    - mm: keep a guard page below a grow-down stack segment (CVE-2010-2240)
+      (not applied to xen featureset)
+    - md/raid10: fix deadlock with unaligned read during resync
+      (Closes: #591415)
+    - Revert "sched, cputime: Introduce thread_group_times()" which would
+      result in an ABI change
+  * Add stable 2.6.32.20:
+    - Fix regressions introduced by original fix for CVE-2010-2240
+  * Add drm and other relevant changes from stable 2.6.34.4
+  * Add 'breaks' relation from image packages to boot loader packages that
+    do not install required hooks (Closes: #593683)
+  * [x86] i915: Blacklist i830, i845, i855 for KMS
+    (Closes: #568207, #582105, #593432, #593507)
+
+  [ Bastian Blank ]
+  * Update Xen patch.
+    - Notify Xen on crash.
+    - Several blktap fixes.
+
+  [ Ritesh Raj Sarraf ]
+  * Add .gnu_debuglink information into kernel modules (Closes: #555549)
+
+  [ Ian Campbell ]
+  * [x86/xen] temporarily remove stack guard page, it breaks the xen
+    toolstack.
+
+  [ Aurelien Jarno ]
+  * [mips,mipsel] Fix 64-bit atomics.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 25 Aug 2010 01:06:18 +0100
+
+linux-2.6 (2.6.32-20) unstable; urgency=low
+
+  [ Moritz Muehlenhoff ]
+  * Backport XVR1000 driver (Closes: #574243)
+
+  [ Ben Hutchings ]
+  * Add stable 2.6.32.18:
+    - CIFS: Fix compile error with __init in cifs_init_dns_resolver()
+      definition (FTBFS for most architectures)
+    - GFS2: rename causes kernel Oops (CVE-2010-2798)
+    - xfs: prevent swapext from operating on write-only files
+      (CVE-2010-2226)
+  * Update debconf template translations:
+    - Swedish (Martin Bagge) (Closes: #592045)
+    - German (Holger Wansing) (Closes: #592226)
+  * [i386/openvz-686] Remove AMD Geode LX and VIA C3 "Nehemiah" from the
+    list of supported processors; they do not implement PAE
+  * V4L/DVB: Add Elgato EyeTV Diversity to dibcom driver (Closes: #591710)
+  * [s390] dasd: use correct label location for diag fba disks
+    (Closes: #582281)
+  * Add drm changes from stable 2.6.34.2 (thanks to Stefan Bader) and
+    2.6.34.3
+  * drm/i915: disable FBC when more than one pipe is active
+    (Closes: #589077)
+  * IB/ipath: Fix probe failure path (Closes: #579393)
+  * ext4: fix freeze deadlock under IO (regression introduced in 2.6.32.17)
+  * xen: Completely disable use of XSAVE (Closes: #592428)
+
+  [ Martin Michlmayr ]
+  * [armel/orion5x] Add a missing #include to fix a build issue.
+  * [armel/kirkwood, armel/orion5x] Build-in support for more devices.
+
+  [ dann frazier ]
+  * can: add limit for nframes and clean up signed/unsigned variables
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 12 Aug 2010 03:26:39 +0100
+
+linux-2.6 (2.6.32-19) unstable; urgency=low
+
+  [ maximilian attems ]
+  * inotify send IN_UNMOUNT events.
+  * inotify fix oneshot support.
+
+  [ Ben Hutchings ]
+  * linux-base: Remove dependency on libapt-pkg-perl (Closes: #589996)
+  * pata_pdc202xx_old: Fix UDMA mode for PDC2024x and PDC2026x controllers
+    (Closes: #590532)
+  * Update debconf template translations:
+    - Czech (Michal Simunek) (Closes: #590546)
+    - Portugese (Américo Monteiro) (Closes: #590557)
+    - French (David Prévot) (Closes: #591149)
+    - Russian (Yuri Kozlov) (Closes: #591241)
+  * Add stable 2.6.32.17:
+    - ethtool: Fix potential kernel buffer overflow in ETHTOOL_GRXCLSRLALL
+      (CVE-2010-2478)
+    - GFS2: Fix up system xattrs (CVE-2010-2525)
+    - Revert ABI changes in firmware_class and ssb
+    - Ignore ABI changes in acpi_processor, hostap and jbd2
+  * Add drm changes from stable 2.6.33.7:
+    - drm/i915: Enable low-power render writes on GEN3 hardware (915, 945,
+      G33 and Atom "Pineview") (Closes: #590193, maybe others)
+  * [i386/xen-686] Remove AMD Geode LX and VIA C3 "Nehemiah" from the list
+    of supported processors; they do not implement PAE
+  * [x86] Add samsung-laptop driver
+
+  [ dann frazier ]
+  * [ia64] Fix crash when gcore reads gate area (Closes: #588574)
+
+  [ Bastian Blank ]
+  * Update Xen patch.
+    - Ignore ABI changes.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 05 Aug 2010 02:43:19 +0100
+
+linux-2.6 (2.6.32-18) unstable; urgency=low
+
+  [ Ben Hutchings ]
+  * iwlwifi: Allocate pages for RX buffers, reducing the probability of
+    allocation failure (Closes: #580124)
+  * postinst: Remove support for 'default' boot loaders. Warn users on
+    upgrade if the current configuration may rely on this.
+  * rt2860sta, rt2870sta: Apply changes from Linux 2.6.33 and 2.6.34
+    - rt2860sta: Fix WPA(2)PSK issue when group cipher of AP is WEP40
+      or WEP104 (Closes: #574766)
+  * rt3090sta: Replace with rt2860sta (Closes: #588863)
+  * [i386/686] Remove AMD K6 from the list of supported processors; it
+    does not implement the CMOV instruction
+  * drm/i915: Add 'reclaimable' to i915 self-reclaimable page allocations
+    (really closes: #534422, we hope)
+  * Revert "x86, paravirt: Add a global synchronization point for pvclock",
+    included in stable 2.6.32.16 (Closes: #588426)
+  * 3c59x: Fix call to mdio_sync() with the wrong argument (Closes: #589989)
+
+  [ Martin Michlmayr ]
+  * Add some patches from the Orion tree, including support for Marvell's
+    Armada 300 (88F6282):
+    - Kirkwood: update MPP definition.
+    - Kirkwood: fix HP t5325 after updating MPP definitions
+    - leds: leds-gpio: Change blink_set callback to be able to turn off
+      blinking
+    - net/phy/marvell: Expose IDs and flags in a .h and add dns323 LEDs
+      setup flag
+    - orion5x: Base support for DNS-323 rev C1
+    - orion5x: Fix soft-reset for some platforms
+    - mtd: orion/kirkwood: add RnB line support to orion mtd driver
+    - mtd: kirkwood: allow machines to register RnB callback
+    - Kirkwood: add support for rev A1 of the 88f6192 and 88f6180 chips
+    - Kirkwood: Add support for 88f6282
+    - PCI: add platform private data to pci_sys_data
+    - Kirkwood: add support for PCIe1
+    - Kirkwood: more factorization of the PCIe init code
+
+  [ maximilian attems ]
+  * sched: Fix over-scheduling bug.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 23 Jul 2010 03:48:08 +0100
+
+linux-2.6 (2.6.32-17) unstable; urgency=low
+
+  [ maximilian attems ]
+  * agp: add no warn since we have a fallback to vmalloc paths.
+
+  [ Ben Hutchings ]
+  * linux-tools: Fix build for hppa and do not attempt to build for
+    architectures where perf events are not available (Closes: #588409)
+  * linux-tools: Add build-dependency on binutils-dev to enable symbol
+    demangling in perf
+  * drm/i915: Fix memory corruption on resume from hibernation
+    (Closes: #534422)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 10 Jul 2010 16:40:38 +0100
+
+linux-2.6 (2.6.32-16) unstable; urgency=low
+
+  [ dann frazier ]
+  * [hppa] clear floating point exception flag on SIGFPE signal
+    (Closes: #559406)
+
+  [ Ben Hutchings ]
+  * Add stable 2.6.32.15
+  * Add mantis and hopper DVB drivers with mb86a16 and tda665x DVB
+    front-ends, backported by Bjørn Mork (Closes: #577264)
+  * Build inet_lro as a module
+  * [sparc] Enable CONFIG_FB_XVR500, CONFIG_FB_XVR2500 (Closes: #508108)
+  * Update Spanish debconf templates, thanks to Omar Campagne
+    (Closes: #580538)
+  * Revert "Add EC path for Thinkpad X100."; it is incomplete and broken
+  * sctp: fix append error cause to ERROR chunk correctly (regression due
+    to fix for CVE-2010-1173)
+  * [powerpc] Enable pata_amd driver, replacing amd74xx
+  * eeepc-laptop: Disable wireless hotplug on more models where the
+    controller is not at the expected address (Closes: #576199)
+  * [mips] Fix boot from ATA hard drives (Closes: #584784):
+    - Set io_map_base for several PCI bridges lacking it
+    - Replace per-platform built-in IDE drivers with libata-based drivers
+    - Enable BLK_DEV_SD as built-in on all platforms
+  * Revert "vlan/macvlan: propagate transmission state to upper layers"
+    (Closes: #585770)
+  * linux-base: Don't identify LVM2 PVs by UUID (Closes: #585852)
+  * usb-serial: Add generic USB WWAN code, backported by Mark Hymers
+    (Closes: #585661)
+    - option, qcserial: Use generic USB WWAN code
+    - qcserial: Add support for Qualcomm Gobi 2000 devices
+  * radeon: Fix MacBook Pro connector quirk (Closes: #585943)
+  * r8169: Fix MDIO timing (Closes: #583139)
+  * Move NEWS to linux-latest-2.6 (Closes: #586401)
+  * 3c59x: Change locking to avoid use of disable_irq() (Closes: #586967)
+  * Enable IPv6 support for IPVS (IP_VS_IPV6) (Closes: #584549)
+  * Revert "tpm: autoload tpm_tis based on system PnP IDs", included in
+    stable 2.6.32.12 (Closes: #584273)
+  * linux-base: If the disk ID update process fails, give the user a
+    chance to retry or change their answers (Closes: #585609)
+  * asix: fix setting mac address for AX88772 (Closes: #587580)
+  * ipv6: Clamp reported valid_lft to a minimum of 0 (Closes: #514644)
+  * ipv6: Use interface max_desync_factor instead of static default
+    (Closes: #514646)
+  * Add stable 2.6.32.16:
+    - Fixes CVE-2010-1641, CVE-2010-1187, CVE-2010-1148, CVE-2010-1173
+      and CVE-2010-2071
+    - libata: disable ATAPI AN by default (Closes: #582737, #582903)
+  * Add drm changes from stable 2.6.33.6
+  * [ia64, powerpc, sparc, x86] Enable KPROBES and KRETPROBES
+    (Closes: #584130)
+  * r8192s_usb: Fix various bugs:
+    - Check for skb allocation failure in 2 more places
+    - Update LED control code
+    - Clean up in case of an error in module initialisation
+    - Rename and remove proc directories correctly if an interface is
+      not called wlan0 (Closes: #582972)
+    - Correct device ID table (Closes: #584945, #587985)
+  * Add r8192u_usb driver
+  * Add linux-tools-<version> package containing the perf tool
+    (Closes: #548715)
+  * Enable USB_SERIAL_TI (Closes: #588096) and USB_SERIAL_WHITEHEAT
+
+  [ Aurelien Jarno ]
+  * [sh4] optimize runtime disabling of trapped I/O. 
+  * [mips] backport mips/swarm: fix M3 TLB exception handler.
+
+  [ Moritz Muehlenhoff ]
+  * Enable X86 board specific fixups for reboot (Closes: #536537)
+
+  [ Martin Michlmayr ]
+  * OpenRD-Base: revert patch "allow SD/UART1 selection" since it
+    never made it upstream.
+  * ARM: update mach types.
+  * Add support for OpenRD-Ultimate.
+  * QNAP TS-11x/TS-21x: Add MPP36 (RAM) and MPP44 (board ID).
+  * Add support for the HP t5325 Thin Client.
+  * m25p80: Add support for Macronix 25L8005.
+  * Add framebuffer driver for XGI chipsets.
+  * [armel/kirkwood] Enable FB_XGI and FRAMEBUFFER_CONSOLE.
+  * [armel] Make MOUSE_PS2 modular.
+  * [armel] Build INPUT_UINPUT for all flavours.
+  * Update Marvell CESA (mv_cesa) driver (Closes: #585790):
+    - Invoke the user callback from a softirq context
+    - Remove compiler warning in mv_cesa driver
+    - Fix situation where the dest sglist is organized differently than...
+    - Fix situations where the src sglist spans more data than the reques...
+    - Enqueue generic async requests
+    - Rename a variable to a more suitable name
+    - Execute some code via function pointers rathr than direct calls
+    - Make the copy-back of data optional
+    - Support processing of data from previous requests
+    - Add sha1 and hmac(sha1) async hash drivers
+  * Update DisplayLink (udlfb) driver:
+    - add dynamic modeset support
+    - checkpatch cleanup
+    - reorganize function order
+    - pre-allocated urb list helpers
+    - clean up function naming
+    - Add functions to expose sysfs metrics and controls
+    - Rework startup and teardown to fix race conditions
+    - improved rendering performance
+    - Support for fbdev mmap clients (defio)
+    - explicit dependencies and warnings
+    - remove printk and small cleanup
+  * [armel/kirkwood] Enable FB_UDL.
+  * [armel] Disable PARPORT_PC (Closes: #588164)
+
+  [ Bastian Blank ]
+  * Disable mISDN support for NETJet cards. The driver binds a generic PCI
+    bridge.
+  * Disable ISDN4Linux drivers.
+
+  [ maximilian attems]
+  * Update openvz patch to 5fd638726a69.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 05 Jul 2010 22:13:33 +0100
+
+linux-2.6 (2.6.32-15) unstable; urgency=low
+
+  [ Ben Hutchings ]
+  * [hppa] Ignore ABI change caused by disabling CONFIG_IDE_TIMINGS
+  * [powerpc] Fix unnecessary ABI change
+
+  [ Bastian Blank ]
+  * xen: Fix crash in netback.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 01 Jun 2010 01:31:05 +0100
+
+linux-2.6 (2.6.32-14) unstable; urgency=low
+
+  [ Ben Hutchings ]
+  * [ia64] Hardcode the output of the scripts under arch/ia64/scripts so
+    that we can build out-of-tree modules correctly (refresh and re-add
+    dropped patch) (Closes: #392592)
+  * vlan/macvlan: propagate transmission state to upper layers
+  * macvlan: add GRO bit to features mask
+  * macvlan: allow multiple driver backends
+  * Add macvtap driver (Closes: #568755)
+  * [ia64] Enable SGI SN support and mspec driver (Closes: #582224)
+  * iwlwifi: Disable QoS when connected to a non-QoS-capable AP
+    (Closes: #578262)
+  * [x86] Disable e_powersaver cpufreq driver as unsafe. It has already
+    been blacklisted by cpufrequtils. The acpi-cpufreq driver can be used
+    instead on some VIA C7 systems. (Closes: #566208)
+  * nouveau: Fix fbcon corruption with font width not divisible by 8
+    (Closes: #583162)
+  * [amd64] ext4: Fix compat EXT4_IOC_ADD_GROUP (used by online resize)
+  * Install debug kernel image in /usr/lib/debug/boot (Closes: #582810)
+  * net: sysfs: Check for null ethtool_ops before getting speed/duplex
+  * Add stable 2.6.32.14:
+    - [hppa] Revert "parisc: Set PCI CLS early in boot.", erroneously
+      included in 2.6.32.13 causing FTBFS
+    - btrfs: check for read permission on src file in the clone ioctl
+      (CVE-2010-1636)
+
+  [ Bastian Blank ]
+  * Update Xen patch.
+    - Fix checksum offloading in netback. (closes: #583366)
+
+  [ maximilian attems]
+  * Add drm changes from stable 2.6.33.5:
+    - i915: Disable FBC on 915GM and 945GM (Closes: #582427)
+  * Update openvz patch to e7399c239fad.
+
+  [ Martin Michlmayr ]
+  * QNAP TS-419P: Export GPIO indicating jumper setting of JP1.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 29 May 2010 00:32:44 +0100
+
 linux-2.6 (2.6.32-13) unstable; urgency=low
 
   [ Frederik Schueler ]
@@ -638,6 +1505,7 @@
   * mips/swarm: fix boot from IDE based media (Sebastian Andrzej Siewior)
     (closes: #466977).
   * backport mips/swarm: fix M3 TLB exception handler.
+    [This patch was actually reverted and never applied in version 2.6.32-13]
   * backport MIPS FPU emulator: allow Cause bits of FCSR to be writeable
     by ctc1. (closes: #580602).
   * mips/swarm: enable adm* hwmon drivers.

Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines	Wed Feb 16 17:06:01 2011	(r16903)
@@ -8,9 +8,9 @@
 kernel-arch: x86
 
 [image]
+bootloaders: grub lilo
 configs:
  kernelarch-x86/config
-suggests: grub | lilo
 
 [image-dbg]
 enabled: true

Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/armel/config	Wed Feb 16 17:06:01 2011	(r16903)
@@ -95,3 +95,9 @@
 CONFIG_KERNEL_LZMA=y
 ## end choice
 
+##
+## file: net/econet/Kconfig
+##
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
+

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Wed Feb 16 17:06:01 2011	(r16903)
@@ -56,11 +56,13 @@
 CONFIG_MACH_DB88F6281_BP=y
 CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
+CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
+CONFIG_MACH_DOCKSTAR=y
 CONFIG_MACH_OPENRD_BASE=y
 CONFIG_MACH_OPENRD_CLIENT=y
 CONFIG_MACH_OPENRD_ULTIMATE=y

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Wed Feb 16 17:06:01 2011	(r16903)
@@ -55,10 +55,21 @@
 CONFIG_MACH_KUROBOX_PRO=y
 CONFIG_MACH_DNS323=y
 CONFIG_MACH_TS209=y
-CONFIG_MACH_LINKSTATION_LSCHL=y
+CONFIG_MACH_TERASTATION_PRO2=y
 CONFIG_MACH_LINKSTATION_PRO=y
+CONFIG_MACH_LINKSTATION_MINI=y
 CONFIG_MACH_TS409=y
+CONFIG_MACH_WRT350N_V2=y
 CONFIG_MACH_MV2120=y
+CONFIG_MACH_EDMINI_V2=y
+CONFIG_MACH_D2NET=y
+CONFIG_MACH_BIGDISK=y
+CONFIG_MACH_NET2BIG=y
+CONFIG_MACH_MSS2=y
+CONFIG_MACH_WNR854T=y
+CONFIG_MACH_RD88F5181L_GE=y
+CONFIG_MACH_RD88F5181L_FXO=y
+CONFIG_MACH_RD88F6183AP_GE=y
 
 ##
 ## file: arch/arm/mm/Kconfig
@@ -580,3 +591,8 @@
 ##
 CONFIG_WAN_ROUTER=m
 
+##
+## file: unknown
+##
+CONFIG_MACH_LINKSTATION_LSCHL=y
+

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Feb 16 17:06:01 2011	(r16903)
@@ -1360,7 +1360,7 @@
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
 # CONFIG_FUSION_LOGGING is not set

Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/defines	Wed Feb 16 17:06:01 2011	(r16903)
@@ -45,8 +45,15 @@
 initramfs-tools: update-initramfs
 
 [relations]
+# compilers
 gcc-4.4: gcc-4.4
+
+# initramfs-generators
 initramfs-fallback: linux-initramfs-tool
 initramfs-tools: initramfs-tools (>= 0.55)
-util-vserver: util-vserver (>= 0.30.215)
+
+# bootloaders
+elilo: elilo (>= 3.12-3.1~)
+lilo: lilo (>= 22.8-8.2~)
+s390-tools: s390-tools (>= 1.8.3-2~)
 

Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/i386/defines	Wed Feb 16 17:06:01 2011	(r16903)
@@ -11,9 +11,9 @@
 kernel-arch: x86
 
 [image]
+bootloaders: grub lilo
 configs:
  kernelarch-x86/config
-suggests: grub | lilo
 
 [486_description]
 hardware: old PCs

Modified: dists/trunk/linux-2.6/debian/config/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/defines	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/ia64/defines	Wed Feb 16 17:06:01 2011	(r16903)
@@ -7,7 +7,8 @@
 kernel-arch: ia64
 
 [image]
-suggests: elilo, fdutils
+bootloaders: elilo
+suggests: fdutils
 
 [itanium_description]
 hardware: Itanium

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed Feb 16 17:06:01 2011	(r16903)
@@ -1282,6 +1282,7 @@
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
 CONFIG_GEODE_WDT=m
 CONFIG_SC520_WDT=m
 CONFIG_EUROTECH_WDT=m

Modified: dists/trunk/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/m68k/config	Wed Feb 16 17:06:01 2011	(r16903)
@@ -128,6 +128,11 @@
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 
 ##
+## file: drivers/staging/Kconfig
+##
+# CONFIG_STAGING is not set
+
+##
 ## file: drivers/telephony/Kconfig
 ##
 # CONFIG_PHONE is not set

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari	Wed Feb 16 17:06:01 2011	(r16903)
@@ -106,7 +106,7 @@
 ##
 ## file: drivers/rtc/Kconfig
 ##
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
 
 ##
 ## file: drivers/scsi/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac	Wed Feb 16 17:06:01 2011	(r16903)
@@ -21,6 +21,11 @@
 CONFIG_SERIAL_CONSOLE=y
 
 ##
+## file: drivers/block/Kconfig
+##
+CONFIG_BLK_DEV_SWIM=m
+
+##
 ## file: drivers/char/Kconfig
 ##
 CONFIG_GEN_RTC=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed Feb 16 17:06:01 2011	(r16903)
@@ -1121,6 +1121,83 @@
 CONFIG_X25=m
 
 ##
+## file: sound/drivers/Kconfig
+##
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_AC97_POWER_SAVE=y
+
+##
+## file: sound/pci/Kconfig
+##
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+##
+## file: sound/pci/hda/Kconfig
+##
+CONFIG_SND_HDA_INTEL=m
+
+##
 ## file: unknown
 ##
 # CONFIG_BASLER_EXCITE is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed Feb 16 17:06:01 2011	(r16903)
@@ -1182,6 +1182,84 @@
 CONFIG_X25=m
 
 ##
+## file: sound/drivers/Kconfig
+##
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+
+##
+## file: sound/pci/Kconfig
+##
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+##
+## file: sound/pci/hda/Kconfig
+##
+CONFIG_SND_HDA_INTEL=m
+
+##
 ## file: unknown
 ##
 # CONFIG_BASLER_EXCITE is not set

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Feb 16 17:06:01 2011	(r16903)
@@ -427,6 +427,7 @@
 CONFIG_WINDFARM_PM81=m
 CONFIG_WINDFARM_PM91=m
 CONFIG_WINDFARM_PM112=m
+CONFIG_WINDFARM_PM121=m
 CONFIG_ANSLCD=m
 CONFIG_PMAC_RACKMETER=m
 

Modified: dists/trunk/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/defines	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/config/s390/defines	Wed Feb 16 17:06:01 2011	(r16903)
@@ -12,7 +12,7 @@
 part-short-tape: IPL from tape
 
 [image]
-suggests: s390-tools
+bootloaders: s390-tools
 
 [s390_description]
 hardware: IBM S/390

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py	Wed Feb 16 17:06:01 2011	(r16903)
@@ -117,6 +117,7 @@
             'parts': SchemaItemList(),
         },
         'image': {
+            'bootloaders': SchemaItemList(),
             'configs': SchemaItemList(),
             'initramfs': SchemaItemBoolean(),
             'initramfs-generators': SchemaItemList(),

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py	Wed Feb 16 17:06:01 2011	(r16903)
@@ -345,6 +345,7 @@
         ('Recommends', PackageRelation),
         ('Suggests', PackageRelation),
         ('Replaces', PackageRelation),
+        ('Breaks', PackageRelation),
         ('Conflicts', PackageRelation),
         ('Description', PackageDescription),
     ))

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/patches.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/patches.py	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/patches.py	Wed Feb 16 17:06:01 2011	(r16903)
@@ -29,14 +29,14 @@
         raise NotImplementedError
 
 class OperationPatch(Operation):
-    def __init__(self, name, fp, data):
+    def __init__(self, name, fopen, data):
         super(OperationPatch, self).__init__(name, data)
-        self.fp = fp
+        self.fopen = fopen
 
     def _call(self, dir, extraargs):
         cmdline = "cd %s; patch -p1 -f -s -t --no-backup-if-mismatch %s" % (dir, extraargs)
         f = os.popen(cmdline, 'wb')
-        shutil.copyfileobj(self.fp, f)
+        shutil.copyfileobj(self.fopen(), f)
         if f.close():
             raise RuntimeError("Patch failed")
 
@@ -103,12 +103,12 @@
         'unifdef': SubOperationFilesUnifdef,
     }
 
-    def __init__(self, name, fp, data):
+    def __init__(self, name, fopen, data):
         super(OperationFiles, self).__init__(name, data)
 
         ops = []
 
-        for line in fp:
+        for line in fopen():
             line = line.strip()
             if not line or line[0] == '#':
                 continue
@@ -156,14 +156,15 @@
                 for suffix, cls in (('', file), ('.bz2', BZ2File), ('.gz', GzipFile)):
                     f1 = f + suffix
                     if os.path.exists(f1):
-                        fp = cls(f1)
+                        # Must copy current bindings into the lambda-function
+                        fopen = lambda cls=cls, f1=f1: cls(f1)
                         break
                 else:
                     raise RuntimeError("Can't find patch %s for series %s" % (filename, self.name))
             else:
                 raise RuntimeError('Undefined operation "%s" in series %s' % (operation, name))
 
-            self.append(self.operations[operation](filename, fp, data))
+            self.append(self.operations[operation](filename, fopen, data))
 
     def __call__(self, cond = bool, dir = '.', reverse = False):
         if not reverse:

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/rules.real	Wed Feb 16 17:06:01 2011	(r16903)
@@ -353,7 +353,7 @@
 endif
 	cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
 	cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
-	rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
+	find $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel \! -name modules.order -exec rm {} \+
 	rm $(PACKAGE_DIR)/lib/firmware -rf
 endif
 	+$(MAKE_SELF) \
@@ -480,7 +480,7 @@
 	install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION)
 ifeq ($(MODULES),True)
 	+$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
-	rm $(DEBUG_DIR)/lib/modules/*/{build,source,modules.*}
+	find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+
 	rm $(DEBUG_DIR)/lib/firmware -rf
 endif
 	+$(MAKE_SELF) install-base BUILDDEB_ARGS="-Zbzip2"

Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in	Wed Feb 16 15:29:20 2011	(r16902)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in	Wed Feb 16 17:06:01 2011	(r16903)
@@ -23,11 +23,6 @@
  modifications to that source consist of security fixes, bug fixes, and
  features that have already been (or are believed to be) accepted by the
  upstream maintainers.
- .
- If you wish to use this package to create a custom Linux kernel, then
- it is suggested that you investigate the package kernel-package,
- which has been designed to ease the task of creating kernel image
- packages.
 
 Package: linux-doc- at version@
 Architecture: all



More information about the Kernel-svn-changes mailing list