• L
    Merge branch 'akpm' (patches from Andrew) · 814a2bf9
    Linus Torvalds 提交于
    Merge second patch-bomb from Andrew Morton:
    
     - a couple of hotfixes
    
     - the rest of MM
    
     - a new timer slack control in procfs
    
     - a couple of procfs fixes
    
     - a few misc things
    
     - some printk tweaks
    
     - lib/ updates, notably to radix-tree.
    
     - add my and Nick Piggin's old userspace radix-tree test harness to
       tools/testing/radix-tree/.  Matthew said it was a godsend during the
       radix-tree work he did.
    
     - a few code-size improvements, switching to __always_inline where gcc
       screwed up.
    
     - partially implement character sets in sscanf
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
      sscanf: implement basic character sets
      lib/bug.c: use common WARN helper
      param: convert some "on"/"off" users to strtobool
      lib: add "on"/"off" support to kstrtobool
      lib: update single-char callers of strtobool()
      lib: move strtobool() to kstrtobool()
      include/linux/unaligned: force inlining of byteswap operations
      include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
      include/asm-generic/atomic-long.h: force inlining of some atomic_long operations
      usb: common: convert to use match_string() helper
      ide: hpt366: convert to use match_string() helper
      ata: hpt366: convert to use match_string() helper
      power: ab8500: convert to use match_string() helper
      power: charger_manager: convert to use match_string() helper
      drm/edid: convert to use match_string() helper
      pinctrl: convert to use match_string() helper
      device property: convert to use match_string() helper
      lib/string: introduce match_string() helper
      radix-tree tests: add test for radix_tree_iter_next
      radix-tree tests: add regression3 test
      ...
    814a2bf9
fault.c 16.9 KB