UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/fs/ext2
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
 		2010-10-24 13:41:39 -07:00
..
Kconfig fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out 2008-10-20 11:43:59 -07:00
Makefile switch ext2 to simple_fsync() 2009-06-11 21:36:12 -04:00
acl.c ext2: update ctime when changing the file's permission by setfacl 2010-06-25 01:20:37 +02:00
acl.h ext[234]: move over to 'check_acl' permission model 2009-09-08 11:09:04 -07:00
balloc.c Take dirtying the inode to callers of ext2_free_blocks() 2010-08-09 16:47:55 -04:00
dir.c introduce __block_write_begin 2010-08-09 16:47:32 -04:00
ext2.h merge ext2 delete_inode and clear_inode, switch to ->evict_inode() 2010-08-09 16:47:57 -04:00
file.c ext2: convert to use the new truncate convention. 2010-05-27 22:15:57 -04:00
ialloc.c merge ext2 delete_inode and clear_inode, switch to ->evict_inode() 2010-08-09 16:47:57 -04:00
inode.c ext2: fix a typo on comment in ext2/inode.c 2010-09-23 13:49:50 +02:00
ioctl.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
namei.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
super.c BKL: Remove BKL from ext2 filesystem 2010-10-04 21:10:44 +02:00
symlink.c ext2: symlink must be handled via filesystem specific operation 2010-04-12 21:11:25 +02:00
xattr.c mbcache: Remove unused features 2010-08-09 16:48:45 -04:00
xattr.h ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xattr_security.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xattr_trusted.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xattr_user.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xip.c ext2: Unify log messages in ext2 2009-12-10 15:02:52 +01:00
xip.h xip: support non-struct page backed memory 2008-04-28 08:58:23 -07:00