Wed Nov 2 04:21:40 UTC 2011

Author: benh
Date: Wed Nov  2 04:21:37 2011
New Revision: 18214

Log:
Merge changes from sid up to 3.0.0-6

Apply the added patches that aren't in 3.1.

Added:
   dists/trunk/linux-2.6/debian/installer/alpha/modules/alpha/kernel-image
   dists/trunk/linux-2.6/debian/installer/amd64/modules/amd64/kernel-image
   dists/trunk/linux-2.6/debian/installer/armel/modules/armel-iop32x/kernel-image
   dists/trunk/linux-2.6/debian/installer/armel/modules/armel-kirkwood/kernel-image
   dists/trunk/linux-2.6/debian/installer/armel/modules/armel-orion5x/kernel-image
   dists/trunk/linux-2.6/debian/installer/armhf/modules/armhf-mx5/kernel-image
   dists/trunk/linux-2.6/debian/installer/hppa/modules/hppa/kernel-image
   dists/trunk/linux-2.6/debian/installer/i386/modules/i386/kernel-image
   dists/trunk/linux-2.6/debian/installer/ia64/modules/ia64/kernel-image
   dists/trunk/linux-2.6/debian/installer/m68k/modules/m68k-mac/kernel-image
   dists/trunk/linux-2.6/debian/installer/m68k/modules/m68k/kernel-image
   dists/trunk/linux-2.6/debian/installer/mips/modules/mips-4kc-malta/kernel-image
   dists/trunk/linux-2.6/debian/installer/mips/modules/mips-sb1-bcm91250a/kernel-image
   dists/trunk/linux-2.6/debian/installer/mips/modules/mips/kernel-image
   dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-4kc-malta/kernel-image
   dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-loongson-2f/kernel-image
   dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-r5k-cobalt/kernel-image
   dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/kernel-image
   dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/kernel-image
   dists/trunk/linux-2.6/debian/installer/s390/modules/s390x-tape/
   dists/trunk/linux-2.6/debian/installer/s390/modules/s390x-tape/kernel-image
   dists/trunk/linux-2.6/debian/installer/s390/modules/s390x/kernel-image
   dists/trunk/linux-2.6/debian/installer/sparc/modules/sparc/kernel-image
   dists/trunk/linux-2.6/debian/installer/sparc64/modules/sparc64/kernel-image
   dists/trunk/linux-2.6/debian/patches/bugfix/all/ark3116-initialisation-fix.patch
      - copied unchanged from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/ark3116-initialisation-fix.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/kobj_uevent-Ignore-if-some-listeners-cannot-handle-m.patch
      - copied unchanged from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/kobj_uevent-Ignore-if-some-listeners-cannot-handle-m.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch
      - copied unchanged from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch
      - copied unchanged from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch
      - copied, changed from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch
Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   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/patches/series/base
   dists/trunk/linux-2.6/debian/po/de.po
   dists/trunk/linux-2.6/debian/po/es.po
   dists/trunk/linux-2.6/debian/templates/control.source.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================

--- dists/trunk/linux-2.6/debian/changelog	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Nov  2 04:21:37 2011	(r18214)
@@ -77,6 +77,144 @@
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 29 Aug 2011 14:48:28 +0100
 
+linux-2.6 (3.0.0-6) unstable; urgency=high
+
+  [ Uwe Kleine-König ]
+  * [amd64] Update rt featureset to 3.0.7-rt20
+
+  [ Bastian Blank ]
+  * Add stable 3.0.7, including:
+    - drm/radeon: Update AVIVO cursor coordinate origin before x/yorigin
+      calculation (Closes: #585130)
+    - ipv6: fix NULL dereference in udp6_ufo_fragment() (Closes: #643817)
+    For the complete list of changes, see:
+     http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.7
+
+  [ Ben Hutchings ]
+  * [powerpc] Change ATA, PATA_MACIO from module to built-in (Closes: #641210)
+  * [powerpc] Change IDE, IDE_GD from built-in to module
+  * Add stable 3.0.8, including:
+    - cputimer: Cure lock inversion
+    - drm/ttm: ensure ttm for new node is bound before calling move_notify()
+    - drm/ttm: unbind ttm before destroying node in accel move cleanup
+    - CIFS: Fix ERR_PTR dereference in cifs_get_root
+    - xfs: start periodic workers later
+    - mm: fix race between mremap and removing migration entry
+    - x25: Prevent skb overreads when checking call user data
+    - crypto: ghash - Avoid null pointer dereference if no key is set
+      (CVE-2011-4081)
+    - hfsplus: Fix kfree of wrong pointers in hfsplus_fill_super() error path
+    For the complete list of changes, see:
+     http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.8
+  * [{mips,mipsel}/{4,5}kc-malta] Disable X.25, as in all other configurations
+  * ark3116: Fix initialisation order (Closes: #640391)
+  * Add empty files to trigger generation of kernel-image udebs
+  * aufs: Update to aufs3.0-20111031 (Closes: #644687)
+  * xfs: Fix possible memory corruption in xfs_readlink (CVE-2011-4077)
+  * oom: fix integer overflow of points in oom_badness (CVE-2011-4097)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 01 Nov 2011 14:50:06 +0000
+
+linux-2.6 (3.0.0-5) unstable; urgency=low
+
+  [ Ben Hutchings ]
+  * Bump ABI to 2
+  * kobj_uevent: Ignore if some listeners cannot handle message
+    (Closes: #641661)
+  * Build udebs for the installer
+  * Add stable 3.0.5 and 3.0.6, including:
+    - TTY: pty, fix pty counting
+    - pata_via: disable ATAPI DMA on AVERATEC 3200
+    - atm: br2684: Fix oops due to skb->dev being NULL
+    - alarmtimers: Avoid possible null pointer traversal
+    - alarmtimers: Memset itimerspec passed into alarm_timer_get
+    - alarmtimers: Avoid possible denial of service with high freq periodic
+      timers
+    - rtc: Fix RTC PIE frequency limit
+    - x86, perf: Check that current->mm is alive before getting user callchain
+    - xen/smp: Warn user why they keel over - nosmp or noapic and what to use
+      instead. (Closes: #637308)
+    - drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate
+    - net/9p: fix client code to fail more gracefully on protocol error
+    - virtio: Fix the size of receive buffer packing onto VirtIO ring.
+    - virtio: VirtIO can transfer VIRTQUEUE_NUM of pages.
+    - fs/9p: Fid is not valid after a failed clunk.
+    - fs/9p: When doing inode lookup compare qid details and inode mode bits.
+    - fs/9p: Always ask new inode in create
+    - net/9p: Fix the msize calculation.
+    - 9p: close ACL leaks
+    - fs/9p: Add fid before dentry instantiation
+    - net/9p: Fix kernel crash with msize 512K
+    - fs/9p: Always ask new inode in lookup for cache mode disabled
+    - vfs: restore pinning the victim dentry in vfs_rmdir()/vfs_rename_dir()
+    - cifs: fix possible memory corruption in CIFSFindNext (CVE-2011-3191)
+    - writeback: introduce .tagged_writepages for the WB_SYNC_NONE sync stage
+    - writeback: update dirtied_when for synced inode to prevent livelock
+    - fib:fix BUG_ON in fib_nl_newrule when add new fib rule
+    - scm: Capture the full credentials of the scm sender
+    - vlan: reset headers on accel emulation path
+    - xfrm: Perform a replay check after return from async codepaths
+    - bridge: Pseudo-header required for the checksum of ICMPv6
+    - bridge: fix a possible use after free
+    - TPM: Call tpm_transmit with correct size (CVE-2011-1161)
+    - TPM: Zero buffer after copying to userspace (CVE-2011-1162)
+    - ALSA: fm801: Gracefully handle failure of tuner auto-detect
+      (Closes: #641946)
+    - btrfs: fix d_off in the first dirent
+    - ARM: 7091/1: errata: D-cache line maintenance operation by MVA may not
+      succeed
+    - ARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op
+    - ALSA: usb-audio: Check for possible chip NULL pointer before clearing
+      probing flag
+    - cfg80211: Fix validation of AKM suites
+    - iwlagn: fix dangling scan request
+    - block: Free queue resources at blk_release_queue() (Closes: #631187)
+    For the complete list of changes, see:
+     http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.5
+     http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.6
+  * Make taskstats require root access (CVE-2011-2494)
+
+  [ Uwe Kleine-König ]
+  * [amd64] Update rt featureset to 3.0.6-rt16 (Closes: #643301)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 05 Oct 2011 15:14:34 +0100
+
+linux-2.6 (3.0.0-4) unstable; urgency=low
+
+  [ Ben Hutchings ]
+  * Make bug script accept failure of lspci (Closes: #639439)
+  * [alpha] Disable GENERIC_GPIO (Closes: #638696)
+  * Add stable 3.0.4, including:
+    - loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other
+    - Btrfs: fix an oops of log replay
+    - ext4: Fix ext4_should_writeback_data() for no-journal mode
+    - ext4: call ext4_ioend_wait and ext4_flush_completed_IO in ext4_evict_inode
+    - ext4: Resolve the hang of direct i/o read in handling
+      EXT4_IO_END_UNWRITTEN.
+    - ext4: fix nomblk_io_submit option so it correctly converts uninit blocks
+    - xen-blkfront: Drop name and minor adjustments for emulated scsi devices
+    - xen/x86: replace order-based range checking of M2P table by linear one
+    - rt2x00: fix order of entry flags modification
+    - Add a personality to report 2.6.x version numbers
+    For the complete list of changes, see:
+     http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.4
+  * sendmmsg/sendmsg: fix unsafe user pointer access
+  * rt2x00: fix crash in rt2800usb_write_tx_desc
+  * rt2x00: fix crash in rt2800usb_get_txwi (Closes: #636531)
+  * [sparc] Only Panther cheetah+ chips have POPC (Closes: #639949)
+  * uvcvideo: Fix crash when linking entities (Closes: #637740)
+  * Update Spanish debconf template translations (Omar Campagne)
+    (Closes: #636242)
+
+  [ Moritz Muehlenhoff ]
+  * Update German Debconf translation. Thanks to Holger Wansing
+    (Closes: #641487)
+
+  [ Uwe Kleine-König ]
+  * [amd64] Update rt featureset to 3.0.4-rt14
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 19 Sep 2011 14:40:42 +0100
+
 linux-2.6 (3.0.0-3) unstable; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed Nov  2 04:21:37 2011	(r18214)
@@ -1106,11 +1106,6 @@
 CONFIG_WAN_ROUTER=m
 
 ##
-## file: net/x25/Kconfig
-##
-CONFIG_X25=m
-
-##
 ## file: sound/drivers/Kconfig
 ##
 CONFIG_SND_DUMMY=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed Nov  2 04:21:37 2011	(r18214)
@@ -1110,11 +1110,6 @@
 CONFIG_WAN_ROUTER=m
 
 ##
-## file: net/x25/Kconfig
-##
-CONFIG_X25=m
-
-##
 ## file: sound/drivers/Kconfig
 ##
 CONFIG_SND_DUMMY=m

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Nov  2 04:21:37 2011	(r18214)
@@ -79,7 +79,8 @@
 ##
 ## file: drivers/ata/Kconfig
 ##
-CONFIG_PATA_MACIO=m
+CONFIG_ATA=y
+CONFIG_PATA_MACIO=y
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NS87415=m
 CONFIG_PATA_PDC2027X=m
@@ -273,9 +274,9 @@
 ##
 ## file: drivers/ide/Kconfig
 ##
-CONFIG_IDE=y
+CONFIG_IDE=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
+CONFIG_IDE_GD=m
 CONFIG_IDE_GD_ATA=y
 # CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m

Added: dists/trunk/linux-2.6/debian/installer/alpha/modules/alpha/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/alpha/modules/alpha/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/amd64/modules/amd64/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/amd64/modules/amd64/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/armel/modules/armel-iop32x/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/armel/modules/armel-iop32x/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/armel/modules/armel-kirkwood/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/armel/modules/armel-kirkwood/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/armel/modules/armel-orion5x/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/armel/modules/armel-orion5x/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/armhf/modules/armhf-mx5/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/armhf/modules/armhf-mx5/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/hppa/modules/hppa/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/hppa/modules/hppa/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/i386/modules/i386/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/i386/modules/i386/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/ia64/modules/ia64/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/ia64/modules/ia64/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/m68k/modules/m68k-mac/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/m68k/modules/m68k-mac/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/m68k/modules/m68k/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/m68k/modules/m68k/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/mips/modules/mips-4kc-malta/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/mips/modules/mips-4kc-malta/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/mips/modules/mips-sb1-bcm91250a/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/mips/modules/mips-sb1-bcm91250a/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/mips/modules/mips/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/mips/modules/mips/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-4kc-malta/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-4kc-malta/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-loongson-2f/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-loongson-2f/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-r5k-cobalt/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-r5k-cobalt/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/s390/modules/s390x-tape/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/s390/modules/s390x-tape/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/s390/modules/s390x/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/s390/modules/s390x/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/sparc/modules/sparc/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/sparc/modules/sparc/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Added: dists/trunk/linux-2.6/debian/installer/sparc64/modules/sparc64/kernel-image
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/sparc64/modules/sparc64/kernel-image	Wed Nov  2 04:21:37 2011	(r18214)
@@ -0,0 +1 @@
+# empty

Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/ark3116-initialisation-fix.patch (from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/ark3116-initialisation-fix.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/ark3116-initialisation-fix.patch	Wed Nov  2 04:21:37 2011	(r18214, copy of r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/ark3116-initialisation-fix.patch)
@@ -0,0 +1,53 @@
+Date: Wed, 26 Oct 2011 13:29:42 +0200
+From: Bart Hartgers <bart.hartgers at gmail.com>
+Subject: [PATCH] ark3116 initialisation fix
+
+Hi,
+
+This patch for the usb serial ark3116 driver fixes an initialisation
+ordering bug that gets triggered on hotplug when using at least recent
+debian/ubuntu userspace. Without it, ark3116 serial cables don't work.
+
+Patch is against 3.1.
+
+Groeten,
+Bart
+
+Signed-off-by: Bart Hartgers <bart.hartgers at gmail.com>
+Tested-by: law_ence.dev at ntlworld.com
+---
+diff -ur linux-3.1.orig//drivers/usb/serial/ark3116.c linux-3.1/drivers/usb/serial/ark3116.c
+--- linux-3.1.orig//drivers/usb/serial/ark3116.c	2011-10-24 09:10:05.000000000 +0200
++++ linux-3.1/drivers/usb/serial/ark3116.c	2011-10-26 09:16:41.776874595 +0200
+@@ -42,7 +42,7 @@
+  * Version information
+  */
+ 
+-#define DRIVER_VERSION "v0.6"
++#define DRIVER_VERSION "v0.7"
+ #define DRIVER_AUTHOR "Bart Hartgers <bart.hartgers+ark3116 at gmail.com>"
+ #define DRIVER_DESC "USB ARK3116 serial/IrDA driver"
+ #define DRIVER_DEV_DESC "ARK3116 RS232/IrDA"
+@@ -380,10 +380,6 @@
+ 		goto err_out;
+ 	}
+ 
+-	/* setup termios */
+-	if (tty)
+-		ark3116_set_termios(tty, port, NULL);
+-
+ 	/* remove any data still left: also clears error state */
+ 	ark3116_read_reg(serial, UART_RX, buf);
+ 
+@@ -406,6 +402,10 @@
+ 	/* enable DMA */
+ 	ark3116_write_reg(port->serial, UART_FCR, UART_FCR_DMA_SELECT);
+ 
++	/* setup termios */
++	if (tty)
++		ark3116_set_termios(tty, port, NULL);
++
+ err_out:
+ 	kfree(buf);
+ 	return result;
+

Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/kobj_uevent-Ignore-if-some-listeners-cannot-handle-m.patch (from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/kobj_uevent-Ignore-if-some-listeners-cannot-handle-m.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/kobj_uevent-Ignore-if-some-listeners-cannot-handle-m.patch	Wed Nov  2 04:21:37 2011	(r18214, copy of r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/kobj_uevent-Ignore-if-some-listeners-cannot-handle-m.patch)
@@ -0,0 +1,39 @@
+From: Milan Broz <mbroz at redhat.com>
+Date: Mon, 22 Aug 2011 15:51:34 +0200
+Subject: [PATCH] kobj_uevent: Ignore if some listeners cannot handle message
+
+commit ebf4127cd677e9781b450e44dfaaa1cc595efcaa upstream.
+
+kobject_uevent() uses a multicast socket and should ignore
+if one of listeners cannot handle messages or nobody is
+listening at all.
+
+Easily reproducible when a process in system is cloned
+with CLONE_NEWNET flag.
+
+(See also http://article.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/5256)
+
+Signed-off-by: Milan Broz <mbroz at redhat.com>
+Acked-by: Kay Sievers <kay.sievers at vrfy.org>
+Cc: stable <stable at kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ lib/kobject_uevent.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
+index 70af0a7..ad72a03 100644
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -282,7 +282,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
+ 							    kobj_bcast_filter,
+ 							    kobj);
+ 			/* ENOBUFS should be handled in userspace */
+-			if (retval == -ENOBUFS)
++			if (retval == -ENOBUFS || retval == -ESRCH)
+ 				retval = 0;
+ 		} else
+ 			retval = -ENOMEM;
+-- 
+1.7.5.4
+

Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch (from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch	Wed Nov  2 04:21:37 2011	(r18214, copy of r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch)
@@ -0,0 +1,54 @@
+From: Frantisek Hrbata <fhrbata at redhat.com>
+Subject: [PATCH v2] oom: fix integer overflow of points in oom_badness
+Date: Mon, 31 Oct 2011 16:56:09 +0100
+
+An integer overflow will happen on 64bit archs if task's sum of rss, swapents
+and nr_ptes exceeds (2^31)/1000 value. This was introduced by commit
+
+f755a04 oom: use pte pages in OOM score
+
+where the oom score computation was divided into several steps and it's no
+longer computed as one expression in unsigned long(rss, swapents, nr_pte are
+unsigned long), where the result value assigned to points(int) is in
+range(1..1000). So there could be an int overflow while computing
+
+176          points *= 1000;
+
+and points may have negative value. Meaning the oom score for a mem hog task
+will be one.
+
+196          if (points <= 0)
+197                  return 1;
+For example:
+[ 3366]     0  3366 35390480 24303939   5       0             0 oom01
+Out of memory: Kill process 3366 (oom01) score 1 or sacrifice child
+
+Here the oom1 process consumes more than 24303939(rss)*4096~=92GB physical
+memory, but it's oom score is one.
+
+In this situation the mem hog task is skipped and oom killer kills another and
+most probably innocent task with oom score greater than one.
+
+The points variable should be of type long instead of int to prevent the int
+overflow.
+
+Signed-off-by: Frantisek Hrbata <fhrbata at redhat.com>
+---
+ mm/oom_kill.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+diff --git a/mm/oom_kill.c b/mm/oom_kill.c
+index 626303b..e9a1785 100644
+--- a/mm/oom_kill.c
++++ b/mm/oom_kill.c
+@@ -162,7 +162,7 @@ static bool oom_unkillable_task(struct task_struct *p,
+ unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
+ 		      const nodemask_t *nodemask, unsigned long totalpages)
+ {
+-	int points;
++	long points;
+ 
+ 	if (oom_unkillable_task(p, mem, nodemask))
+ 		return 0;
+-- 
+1.7.6.4
+

Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch (from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch	Wed Nov  2 04:21:37 2011	(r18214, copy of r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch)
@@ -0,0 +1,18 @@
+Subject: [PATCH] xfs: Fix possible memory corruption in xfs_readlink (2)
+From: Ben Hutchings <ben at decadent.org.uk>
+
+Previous fix doesn't check for integer overflow.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+--- a/fs/xfs/xfs_vnodeops.c
++++ b/fs/xfs/xfs_vnodeops.c
+@@ -127,7 +127,7 @@ xfs_readlink(
+ 	if (!pathlen)
+ 		goto out;
+ 
+-	if (pathlen > MAXPATHLEN) {
++	if (pathlen < 0 || pathlen > MAXPATHLEN) {
+ 		xfs_alert(mp, "%s: inode (%llu) symlink length (%d) too long",
+ 			 __func__, (unsigned long long)ip->i_ino, pathlen);
+ 		ASSERT(0);

Copied and modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch (from r18213, dists/sid/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch	Wed Nov  2 02:48:09 2011	(r18213, copy source)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch	Wed Nov  2 04:21:37 2011	(r18214)
@@ -8,7 +8,6 @@
 xfs_readlink_by_handle() and via VFS.
 
 Signed-off-by: Carlos Maiolino <cmaiolino at redhat.com>
-[bwh: Adjust deleted S_ISLNK check for 3.0]
 ---
  fs/xfs/xfs_vnodeops.c |   11 ++++++++---
  1 files changed, 8 insertions(+), 3 deletions(-)
@@ -21,7 +20,7 @@
  
  	xfs_ilock(ip, XFS_ILOCK_SHARED);
  
--	ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFLNK);
+-	ASSERT(S_ISLNK(ip->i_d.di_mode));
 -	ASSERT(ip->i_d.di_size <= MAXPATHLEN);
 -
  	pathlen = ip->i_d.di_size;

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Wed Nov  2 04:21:37 2011	(r18214)
@@ -43,3 +43,8 @@
 + bugfix/ia64/ia64-gpio-GENERIC_GPIO-default-must-be-n.patch
 + features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch
 + bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
++ bugfix/all/kobj_uevent-Ignore-if-some-listeners-cannot-handle-m.patch
++ bugfix/all/ark3116-initialisation-fix.patch
++ bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch
++ bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch
++ bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch

Modified: dists/trunk/linux-2.6/debian/po/de.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/de.po	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/po/de.po	Wed Nov  2 04:21:37 2011	(r18214)
@@ -1,14 +1,14 @@
 # Translation of linux-2.6 templates to german.
 # Copyright (C) 2010 Holger Wansing.
 # This file is distributed under the same license as the linux-2.6 package.
-# Holger Wansing <linux at wansing-online.de>, 2010.
+# Holger Wansing <linux at wansing-online.de>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6 2.6.32-11\n"
+"Project-Id-Version: linux-2.6 3.0.0-3\n"
 "Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-08-07 10:32+0200\n"
-"PO-Revision-Date: 2010-08-08 14:22+0200\n"
+"POT-Creation-Date: 2011-07-04 04:24+0100\n"
+"PO-Revision-Date: 2011-09-13 20:41+0200\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
 "Language: de\n"
@@ -16,21 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
-msgid ""
-"If the boot loader needs to be updated whenever a new kernel is installed, "
-"the boot loader package should install a script in /etc/kernel/postinst.d.  "
-"Alternately, you can specify the command to update the boot loader by "
-"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
-"Falls der Bootloader aktualisiert werden muss, wenn ein neuer Kernel "
-"installiert wird, sollte das Bootloader-Paket ein Skript in "
-"/etc/kernel/postinst.d installieren. Alternativ können Sie den Befehl für "
-"die Aktualisierung des Bootloaders über das Setzen der Variable "
-"»postinst_hook« in /etc/kernel-img.conf festlegen."
-
 #. Type: boolean
 #. Description
 #: ../templates/temp.image.plain/templates:2001
@@ -147,16 +132,18 @@
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Aktualisierung der Bootloader-Konfiguration erforderlich"
+msgid "Ramdisk configuration must be updated"
+msgstr "Aktualisierung der Ramdisk-Konfiguration erforderlich"
 
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
 msgid ""
-"Kernel packages no longer update a default boot loader.  You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Kernel-Pakete aktualisieren nicht mehr länger den Standard-Bootloader. "
-"Sie sollten den Eintrag »do_bootloader = yes« aus /etc/kernel-img.conf "
-"entfernen."
+"Kernel packages will no longer run a specific ramdisk creator.  The ramdisk "
+"creator package must install a script in /etc/kernel/postinst.d, and you "
+"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
+msgstr ""
+"Kernel-Pakete werden keinen spezifischen Ramdisk-Ersteller mehr ausführen. "
+"Das Ramdisk-Ersteller-Paket muss ein Skript in /etc/kernel/postinst.d "
+"installieren und Sie sollten in /etc/kernel-img.conf die Zeile entfernen, "
+"die mit »ramdisk =« beginnt."

Modified: dists/trunk/linux-2.6/debian/po/es.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/es.po	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/po/es.po	Wed Nov  2 04:21:37 2011	(r18214)
@@ -3,7 +3,7 @@
 #
 #   Changes:
 #    - Initial translation
-#    Omar Campagne <ocampagne at gmail.com> 2010
+#    Omar Campagne <ocampagne at gmail.com> 2010, 2011
 #   
 #    - Review and update
 #    Javier Fernandez-Sanguino, December 2010
@@ -29,9 +29,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32+5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-11 10:35+0100\n"
-"PO-Revision-Date: 2010-12-15 04:08+0100\n"
+"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"POT-Creation-Date: 2011-07-04 04:24+0100\n"
+"PO-Revision-Date: 2011-07-16 17:59+0200\n"
 "Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -45,21 +45,6 @@
 "X-POFile-SpellExtra: Debian CORE free running dobootloader UUID dep SIGNAL\n"
 "X-POFile-SpellExtra: Guidelines modulesbase vmlinuz postinst\n"
 
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
-msgid ""
-"If the boot loader needs to be updated whenever a new kernel is installed, "
-"the boot loader package should install a script in /etc/kernel/postinst.d.  "
-"Alternately, you can specify the command to update the boot loader by "
-"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
-"El paquete del gestor de arranque debería instalar un script en "
-"«/etc/kernel/postinst.d» si tiene que actualizarse cada vez que se instala "
-"un nuevo núcleo. También puede especificar la orden a ejecutar para "
-"actualizar el gestor de arranque configurando la variable «postinst_hook» "
-"en el fichero de configuración «/etc/kernel-img.conf»."
-
 #. Type: boolean
 #. Description
 #: ../templates/temp.image.plain/templates:2001
@@ -176,16 +161,19 @@
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Debe actualizarse la configuración del gestor de arranque"
+msgid "Ramdisk configuration must be updated"
+msgstr "Se debe actualizar la configuración del disco RAM"
 
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
 msgid ""
-"Kernel packages no longer update a default boot loader.  You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Los paquetes del núcleo ya no actualizan el gestor de arranque por omisión. "
-"Debe eliminar la línea «do_bootloader = yes» del archivo de configuración "
-"«/etc/kernel-img.conf»."
+"Kernel packages will no longer run a specific ramdisk creator.  The ramdisk "
+"creator package must install a script in /etc/kernel/postinst.d, and you "
+"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
+msgstr ""
+"Los paquetes de núcleo ya no ejecutarán un creador de disco RAM. El "
+"paquete de creador de disco RAM debe instalar un script en "
+"«/etc/kernel/postinst.d», y el usuario debería eliminar manualmente la línea "
+"que empieza con «ramdisk =» del fichero «/etc/kernel-img.conf»."
+

Modified: dists/trunk/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in	Wed Nov  2 02:48:09 2011	(r18213)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in	Wed Nov  2 04:21:37 2011	(r18214)
@@ -3,7 +3,7 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel], libelf-dev, libdw-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, libnewt-dev, kernel-wedge (>= 2.80)
+Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel], libelf-dev, libdw-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, libnewt-dev, kernel-wedge (>= 2.81)
 Build-Depends-Indep: bzip2
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/
 Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log

