Skip to content
  • Linus Torvalds's avatar
    Merge branch 'akpm' (incoming from Andrew) · 76ca7d1c
    Linus Torvalds authored
    Merge first patch-bomb from Andrew Morton:
     - Various misc bits
     - kmemleak fixes
     - small befs, codafs, cifs, efs, freexxfs, hfsplus, minixfs, reiserfs things
     - fanotify
     - I appear to have become SuperH maintainer
     - ocfs2 updates
     - direct-io tweaks
     - a bit of the MM queue
     - printk updates
     - MAINTAINERS maintenance
     - some backlight things
     - lib/ updates
     - checkpatch updates
     - the rtc queue
     - nilfs2 updates
     - Small Documentation/ updates
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (237 commits)
      Documentation/SubmittingPatches: remove references to patch-scripts
      Documentation/SubmittingPatches: update some dead URLs
      Documentation/filesystems/ntfs.txt: remove changelog reference
      Documentation/kmemleak.txt: updates
      fs/reiserfs/super.c: add __init to init_inodecache
      fs/reiserfs: move prototype declaration to header file
      fs/hfsplus/attributes.c: add __init to hfsplus_create_attr_tree_cache()
      fs/hfsplus/extents.c: fix concurrent acess of alloc_blocks
      fs/hfsplus/extents.c: remove unused variable in hfsplus_get_block
      nilfs2: update project's web site in nilfs2.txt
      nilfs2: update MAINTAINERS file entries fix
      nilfs2: verify metadata sizes read from disk
      nilfs2: add FITRIM ioctl support for nilfs2
      nilfs2: add nilfs_sufile_trim_fs to trim clean segs
      nilfs2: implementation of NILFS_IOCTL_SET_SUINFO ioctl
      nilfs2: add nilfs_sufile_set_suinfo to update segment usage
      nilfs2: add struct nilfs_suinfo_update and flags
      nilfs2: update MAINTAINERS file entries
      fs/coda/inode.c: add __init to init_inodecache()
      BEFS: logging cleanup
      ...
    76ca7d1c