[kernel] r18264 - in dists/trunk/linux-2.6/debian: . patches/series

[Ben Hutchings]

Author: benh
Date: Sun Nov 13 19:20:11 2011
New Revision: 18264

Log:
Defer addition of accept4() on ia64 until we're sure about the system call number

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Nov 13 19:14:22 2011	(r18263)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Nov 13 19:20:11 2011	(r18264)
@@ -20,7 +20,6 @@
     firmware for drivers we don't build
   * hfs: fix hfs_find_init() sb->ext_tree NULL ptr oops (CVE-2011-2203)
   * vmscan: fix shrinker callback bug in fs/super.c
-  * [ia64] Add accept4() syscall, thanks to Émeric Maschino (Closes: #647825)
   * block: Always check length of all iov entries in blk_rq_map_user_iov()
   * [x86] Add amilo-rfkill driver for some Fujitsu-Siemens Amilo laptops
     (Closes: #631664)

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Nov 13 19:14:22 2011	(r18263)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Nov 13 19:20:11 2011	(r18264)
@@ -57,6 +57,8 @@
 + bugfix/all/PM-Freezer-Reimplement-wait_event_freezekillable-usi.patch
 + bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch
 + bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch
-+ bugfix/ia64/ia64-Add-accept4-syscall.patch
 + bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch
 + features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
+
+# Defer until we're sure about the system call number
+#+ bugfix/ia64/ia64-Add-accept4-syscall.patch