diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-15 10:49:33 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-15 10:49:33 -0700 | 
| commit | 4ecd4ff55ac5c7fe9e232f34a41c4d54f2d825c1 (patch) | |
| tree | 527d92e360bfcd068e861a280d3aef0d46136fab /drivers/fpga/fpga-region.c | |
| parent | 966859b9f73de9bcc14dece604ced6c0c562075b (diff) | |
| parent | 61e8d462457f202bf0c6393133425ad387825e22 (diff) | |
Merge branch 'for-linus-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
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
Diffstat (limited to 'drivers/fpga/fpga-region.c')
0 files changed, 0 insertions, 0 deletions
