projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d9ce17 c32676e)
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 21:41:33 +0000 (14:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 21:41:33 +0000 (14:41 -0700)
commitfdb64f93b38a3470fa4db8cd5720b8c731922d1a
tree3b17370d30a2b580af72b26f37ec7176c9ecdd84tree | snapshot
parent2d9ce177e68645945e3366cfe2d66ee3c28cd4f2commit | diff
parentc32676eea19ce29cb74dba0f97b085e83f6b8915commit | diff
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Fix inode size update before data write in xfs_setattr
  [XFS] Allow punching holes to free space when at ENOSPC
  [XFS] Implement ->page_mkwrite in XFS.
  [FS] Implement block_page_mkwrite.

Manually fix up conflict with Nick's VM fault handling patches in
fs/xfs/linux-2.6/xfs_file.c

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/xfs/linux-2.6/xfs_file.c diff1 | diff2 | blob | history
John Crispins staging tree