1. 11 1月, 2011 38 次提交
  2. 10 1月, 2011 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · b65f0d67
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        nilfs2: unfold nilfs_dat_inode function
        nilfs2: do not pass sbi to functions which can get it from inode
        nilfs2: get rid of nilfs_mount_options structure
        nilfs2: simplify nilfs_mdt_freeze_buffer
        nilfs2: get rid of loaded flag from nilfs object
        nilfs2: fix a checkpatch error in page.c
        nilfs2: fiemap support
        nilfs2: mark buffer heads as delayed until the data is written to disk
        nilfs2: call nilfs_error inside bmap routines
        fs/nilfs2/super.c: Use printf extension %pV
        MAINTAINERS: add nilfs2 git tree entry
      b65f0d67
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · f3ea5972
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: use CreationTime like an i_generation field
        cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
        cifs: show "acl" in DebugData Features when it's compiled in
        cifs: move "ntlmssp" and "local_leases" options out of experimental code
        cifs: replace some hardcoded values with preprocessor constants
        cifs: remove unnecessary locking around sequence_number
        [CIFS] Fix minor merge conflict in fs/cifs/dir.c
        CIFS: Simplify cifs_open code
        CIFS: Simplify non-posix open stuff (try #2)
        CIFS: Add match_port check during looking for an existing connection (try #4)
        CIFS: Simplify ipv*_connect functions into one (try #4)
        cifs: Support NTLM2 session security during NTLMSSP authentication [try #5]
        cifs: don't overwrite dentry name in d_revalidate
      f3ea5972