]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a40c0a c2df145)
Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 17:14:54 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 17:14:54 +0000 (10:14 -0700)
commit9defe90e7fe13e3998ed1e30007cba8e80860213
treeab793556d6a9d2d4e0f366eed58e74b8e705cd8ctree | snapshot
parent5a40c0acb72c8f6cae7904b9fca4bdb38cb40c66commit | diff
parentc2df14581817fe909d4fb2be2e04334dca1b7e16commit | diff
Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually

Clash due to new delete_inode behavior (the filesystem now needs to do
the truncate_inode_pages() call itself).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/jfs/inode.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.