err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

author	Linus Torvalds <torvalds@g5.osdl.org>
	Sun, 11 Sep 2005 17:14:54 +0000 (10:14 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Sun, 11 Sep 2005 17:14:54 +0000 (10:14 -0700)
commit	32983696a48a6c41d99f3eca82ba7510a552d843
tree	ab793556d6a9d2d4e0f366eed58e74b8e705cd8c	tree \| snapshot
parent	ce1289adeb67b5480f35cb257cbf6e9881153783	commit \| diff
parent	1d15b10f95d4c4295a0f2288c7be7b6a005490da	commit \| 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 2.6 source tree

RSS Atom