[kernel] r13618 - in dists/sid/linux-2.6/debian: . config patches/bugfix/all/stable patches/series

[Bastian Blank]

Author: waldi
Date: Fri May 15 22:12:47 2009
New Revision: 13618

Log:
* debian/changelog: Update.
* debian/config/defines: Ignore remaining ABI changes.
* debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch: Add.
* debian/patches/series/5: Add new patch.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri May 15 21:06:35 2009	(r13617)
+++ dists/sid/linux-2.6/debian/changelog	Fri May 15 22:12:47 2009	(r13618)
@@ -71,6 +71,7 @@
     - mac80211: Fix bug in getting rx status for frames pending in reorder
       buffer
     - forcedeth: Fix resume from hibernation regression.
+  * Ignore ABI change.
 
  -- dann frazier <dannf at debian.org>  Mon, 04 May 2009 13:40:51 -0600
 

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Fri May 15 21:06:35 2009	(r13617)
+++ dists/sid/linux-2.6/debian/config/defines	Fri May 15 22:12:47 2009	(r13618)
@@ -1,5 +1,7 @@
 [abi]
 abiname: 2
+ignore-changes:
+ copy_fs_struct exit_fs
 
 [base]
 arches:

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch	Fri May 15 22:12:47 2009	(r13618)
@@ -0,0 +1,21 @@
+diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
+index 78a05bf..818ff7e 100644
+--- a/include/linux/fs_struct.h
++++ b/include/linux/fs_struct.h
+@@ -4,11 +4,14 @@
+ #include <linux/path.h>
+ 
+ struct fs_struct {
+-	int users;
++	atomic_t count;
+ 	rwlock_t lock;
+ 	int umask;
+-	int in_exec;
+ 	struct path root, pwd;
++#ifndef __GENKSYMS__
++	int users;
++	int in_exec;
++#endif
+ };
+ 
+ extern struct kmem_cache *fs_cachep;

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	Fri May 15 21:06:35 2009	(r13617)
+++ dists/sid/linux-2.6/debian/patches/series/5	Fri May 15 22:12:47 2009	(r13618)
@@ -5,3 +5,4 @@
 + bugfix/all/mvsdio-platform.patch
 - bugfix/all/drm-intel.git-f544847fbaf099278343f875987a983f2b913134.patch
 + bugfix/all/stable/2.6.29.3.patch
++ bugfix/all/stable/2.6.29.3-abi-1.patch