Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore · 7f60ba38
    Linus Torvalds authored
    Pull pstore changes from Anton Vorontsov:
    
     1) We no longer ad-hoc to the function tracer "high level"
        infrastructure and no longer use its debugfs knobs.  The change
        slightly touches kernel/trace directory, but it got the needed ack
        from Steven Rostedt:
    
          http://lkml.org/lkml/2012/8/21/688
    
     2) Added maintainers entry;
    
     3) A bunch of fixes, nothing special.
    
    * tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore:
      pstore: Avoid recursive spinlocks in the oops_in_progress case
      pstore/ftrace: Convert to its own enable/disable debugfs knob
      pstore/ram: Add missing platform_device_unregister
      MAINTAINERS: Add pstore maintainers
      pstore/ram: Mark ramoops_pstore_write_buf() as notrace
      pstore/ram: Fix printk format warning
      pstore/ram: Fix possible NULL dereference
    7f60ba38