• Linus Torvalds's avatar
    Merge branch 'for-linus-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 4ecd4ff5
    Linus Torvalds authored
    Pull UML updates from Richard Weinberger:
     "Mostly fixes for UML:
    
       - First round of fixes for PTRACE_GETRESET/SETREGSET
    
       - A printf vs printk cleanup
    
       - Minor improvements"
    
    * 'for-linus-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
      um: Correctly check for PTRACE_GETRESET/SETREGSET
      um: v2: Use generic NOTES macro
      um: Add kerneldoc for userspace_tramp() and start_userspace()
      um: Add kerneldoc for segv_handler
      um: stub-data.h: remove superfluous include
      um: userspace - be more verbose in ptrace set regs error
      um: add dummy ioremap and iounmap functions
      um: Allow building and running on older hosts
      um: Avoid longjmp/setjmp symbol clashes with libpthread.a
      um: console: Ignore console= option
      um: Use os_warn to print out pre-boot warning/error messages
      um: Add os_warn() for pre-boot warning/error messages
      um: Use os_info for the messages on normal path
      um: Add os_info() for pre-boot information messages
      um: Use printk instead of printf in make_uml_dir
    4ecd4ff5
um_arch.c 8.04 KB