Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable...

Conflicts:

	queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch

diff --cc queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch
index 95c1c0693e6bc0c09172676743f1c0952bda8897,00d0da2635975cd9a31595f0ff7296af0edb9012..cebf71b46956a717eecce60fd2c2097dfad448ef
--- 1/queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch
--- 2/queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch
+++ b/queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch
@@@ -1,28 -1,29 +1,30 @@@
- From jmorris@namei.org  Wed Apr 26 10:51:36 2006
- Date: Wed, 26 Apr 2006 02:45:03 -0400 (EDT)
+ From git-commits-head-owner@vger.kernel.org Wed Apr 26 08:11:31 2006
+ Date: Wed, 26 Apr 2006 15:11:00 GMT
+ Message-Id: <200604261511.k3QFB0R8000610@hera.kernel.org>
+ From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+ To: git-commits-head@vger.kernel.org
+ Subject: LSM: add missing hook to do_compat_readv_writev()
+ 
  From: James Morris <jmorris@namei.org>
- To: Linus Torvalds <torvalds@osdl.org>
- cc: Al Viro <viro@ftp.linux.org.uk>, Chris Wright <chrisw@sous-sol.org>,
-         Stephen Smalley <sds@tycho.nsa.gov>, linux-kernel@vger.kernel.org
- Subject: [PATCH] LSM: add missing hook to do_compat_readv_writev()
  
- This patch addresses a flaw in LSM, where there is no mediation of readv() 
+ This patch addresses a flaw in LSM, where there is no mediation of readv()
  and writev() in for 32-bit compatible apps using a 64-bit kernel.
  
- This bug was discovered and fixed initially in the native readv/writev 
- code [1], but was not fixed in the compat code.  Thanks to Al for spotting 
+ This bug was discovered and fixed initially in the native readv/writev
+ code [1], but was not fixed in the compat code.  Thanks to Al for spotting
  this one.
  
- Signed-off-by: James Morris <jmorris@namei.org> 
+   [1] http://lwn.net/Articles/154282/
+ 
+ Signed-off-by: James Morris <jmorris@namei.org>
  Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  
- [1] http://lwn.net/Articles/154282/
- 
  ---
- 
   fs/compat.c |    4 ++++
-  1 files changed, 4 insertions(+)
+  1 file changed, 4 insertions(+)
  
  --- linux-2.6.16.11.orig/fs/compat.c
  +++ linux-2.6.16.11/fs/compat.c