From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 May 2010 02:37:45 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: v2.6.35-rc1~432
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d;p=linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (69 commits)
  fix handling of offsets in cris eeprom.c, get rid of fake on-stack files
  get rid of home-grown mutex in cris eeprom.c
  switch ecryptfs_write() to struct inode *, kill on-stack fake files
  switch ecryptfs_get_locked_page() to struct inode *
  simplify access to ecryptfs inodes in ->readpage() and friends
  AFS: Don't put struct file on the stack
  Ban ecryptfs over ecryptfs
  logfs: replace inode uid,gid,mode initialization with helper function
  ufs: replace inode uid,gid,mode initialization with helper function
  udf: replace inode uid,gid,mode init with helper
  ubifs: replace inode uid,gid,mode initialization with helper function
  sysv: replace inode uid,gid,mode initialization with helper function
  reiserfs: replace inode uid,gid,mode initialization with helper function
  ramfs: replace inode uid,gid,mode initialization with helper function
  omfs: replace inode uid,gid,mode initialization with helper function
  bfs: replace inode uid,gid,mode initialization with helper function
  ocfs2: replace inode uid,gid,mode initialization with helper function
  nilfs2: replace inode uid,gid,mode initialization with helper function
  minix: replace inode uid,gid,mode init with helper
  ext4: replace inode uid,gid,mode init with helper
  ...

Trivial conflict in fs/fs-writeback.c (mark bitfields unsigned)
---

e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d
diff --cc fs/fs-writeback.c
index 437a7431b4ea,24e85ce11891..5c4161f1fd9a
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@@ -42,10 -42,9 +42,10 @@@ struct wb_writeback_args 
  	long nr_pages;
  	struct super_block *sb;
  	enum writeback_sync_modes sync_mode;
- 	int for_kupdate:1;
- 	int range_cyclic:1;
- 	int for_background:1;
- 	int sb_pinned:1;
+ 	unsigned int for_kupdate:1;
+ 	unsigned int range_cyclic:1;
+ 	unsigned int for_background:1;
++	unsigned int sb_pinned:1;
  };
  
  /*