]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 23:11:41 +0000 (16:11 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 23:11:41 +0000 (16:11 -0700)
commit15eb7105a74a0a5d72d006fec2192b0ec692b5cc
treeb774ed6e13751f590038c1d0454436326339cd62
parenta5d1792847172077d173c959c37d4562b9ec69e6
parentcef0893dcf1fdf22943aa49e75ee1eb3bfffe5f5
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

* 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2:
  configfs: Make sure configfs_init() is called before consumers.
  configfs: configfs_mkdir() failed to cleanup linkage.
  configfs: Fix a reference leak in configfs_mkdir().
  ocfs2: fix gfp mask in some file system paths
  ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal()
  ocfs2: take meta data lock in ocfs2_file_aio_read()
  ocfs2: take data locks around extend