1. 06 Dec, 2006 37 commits
  2. 05 Dec, 2006 3 commits
    • Matthew Wilcox's avatar
      [PATCH] Centralise definitions of sector_t and blkcnt_t · e6243863
      Matthew Wilcox authored
      CONFIG_LBD and CONFIG_LSF are spread into asm/types.h for no particularly
      good reason.
      
      Centralising the definition in linux/types.h means that arch maintainers
      don't need to bother adding it, as well as fixing the problem with
      x86-64 users being asked to make a decision that has absolutely no
      effect.
      
      The H8/300 porters seem particularly confused since I'm not aware of any
      microcontrollers that need to support 2TB filesystems.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e6243863
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block · 2d941e99
      Linus Torvalds authored
      * 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] blktrace: don't return blktrace_seq from trace_note()
        [PATCH] blktrace: uninline trace_note()
      2d941e99
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 651857a1
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits)
        ocfs2: implement i_op->permission
        configfs: make configfs_dirent_exists() static
        ocfs2: update file system paths to set atime
        ocfs2: core atime update functions
        ocfs2: Add splice support
        ocfs2: Remove ocfs2_write_should_remove_suid()
        [PATCH] Export should_remove_suid()
        configfs: mutex_lock_nested() fix
        ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t
        ocfs2: remove handle argument to ocfs2_start_trans()
        ocfs2: remove ocfs2_journal_handle journal field
        ocfs2: pass ocfs2_super * into ocfs2_commit_trans()
        ocfs2: remove unused handle argument from ocfs2_meta_lock_full()
        ocfs2: make ocfs2_alloc_handle() static
        ocfs2: remove unused ocfs2_handle_add_lock()
        ocfs2: remove unused ocfs2_handle_add_inode()
        ocfs2: Don't allocate handle early in ocfs2_rename()
        ocfs2: don't use handle for locking in allocation functions
        ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_rename()
        ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_symlink()
        ...
      651857a1