• Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · c397f8fa
    Linus Torvalds authored
    Merge fifth set of updates from Andrew Morton:
    
     - A few things which were awaiting merges from linux-next:
         - rtc
         - ocfs2
         - misc others
    
     - Willy's "dax" feature: direct fs access to memory (mainly NV-DIMMs)
       which isn't backed by pageframes.
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (37 commits)
      rtc: add driver for DS1685 family of real time clocks
      MAINTAINERS: add entry for Maxim PMICs on Samsung boards
      lib/Kconfig: use bool instead of boolean
      powerpc: drop _PAGE_FILE and pte_file()-related helpers
      ocfs2: set append dio as a ro compat feature
      ocfs2: wait for orphan recovery first once append O_DIRECT write crash
      ocfs2: complete the rest request through buffer io
      ocfs2: do not fallback to buffer I/O write if appending
      ocfs2: allocate blocks in ocfs2_direct_IO_get_blocks
      ocfs2: implement ocfs2_direct_IO_write
      ocfs2: add orphan recovery types in ocfs2_recover_orphans
      ocfs2: add functions to add and remove inode in orphan dir
      ocfs2: prepare some interfaces used in append direct io
      MAINTAINERS: fix spelling mistake & remove trailing WS
      dax: does not work correctly with virtual aliasing caches
      brd: rename XIP to DAX
      ext4: add DAX functionality
      dax: add dax_zero_page_range
      ext2: get rid of most mentions of XIP in ext2
      ext2: remove ext2_aops_xip
      ...
    c397f8fa
MAINTAINERS 297 KB