summaryrefslogtreecommitdiffstats
path: root/arch/um
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (patches from Andrew)Linus Torvalds2017-11-151-3/+0
|\
| * mm, arch: remove empty_bad_page*Michal Hocko2017-11-151-3/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-11-151-5/+4
|\ \ | |/ |/|
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-0438-0/+38
| |\
| * | um: net: Convert timers to use timer_setup()Kees Cook2017-10-181-5/+4
* | | Merge branch 'linus' into locking/core, to resolve conflictsIngo Molnar2017-11-0738-0/+38
|\ \ \ | | |/ | |/|
| * | License cleanup: add SPDX GPL-2.0 license identifier to files with no licenseGreg Kroah-Hartman2017-11-0238-0/+38
| |/
* | linux/compiler.h: Split into compiler.h and compiler_types.hWill Deacon2017-10-241-1/+1
|/
* um/time: Fixup namespace collisionThomas Gleixner2017-09-291-2/+2
* arch: remove unused *_segments() macros/functionsTobias Klauser2017-09-221-5/+0
* Merge branch 'for-linus-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2017-09-1611-19/+27
|\
| * um: return negative in tuntap_open_tramp()Dan Carpenter2017-09-131-1/+1
| * um: Use relative modversions with LD_SCRIPT_DYNThomas Meyer2017-09-131-0/+1
| * um: link vmlinux with -no-pieThomas Meyer2017-09-131-1/+1
| * um: Fix CONFIG_GCOV for modules.Thomas Meyer2017-09-131-0/+7
| * Fix minor typos and grammar in UML start_up helpJames Pack2017-09-131-3/+3
| * um: defconfig: Cleanup from old Kconfig optionsKrzysztof Kozlowski2017-09-132-2/+0
| * um: Fix FP register size for XSTATE/XSAVEThomas Meyer2017-09-134-12/+14
* | Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2017-09-141-6/+1
|\ \
| * | mconsole: switch to kernel_readChristoph Hellwig2017-09-041-6/+1
| |/
* | Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2017-09-041-0/+8
|\ \ | |/ |/|
| * x86/unwind: Add the ORC unwinderJosh Poimboeuf2017-07-261-0/+8
* | mm: fix MADV_[FREE|DONTNEED] TLB flush miss problemMinchan Kim2017-08-101-1/+6
* | mm: refactor TLB gathering APIMinchan Kim2017-08-101-3/+5
|/
* Merge branch 'for-linus-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2017-07-1517-61/+172
|\
| * um: v2: Use generic NOTES macroThomas Meyer2017-07-101-1/+1
| * um: Add kerneldoc for userspace_tramp() and start_userspace()Thomas Meyer2017-07-071-1/+30
| * um: Add kerneldoc for segv_handlerThomas Meyer2017-07-071-0/+10
| * um: stub-data.h: remove superfluous includeThomas Meyer2017-07-071-2/+0
| * um: userspace - be more verbose in ptrace set regs errorThomas Meyer2017-07-071-2/+8
| * um: add dummy ioremap and iounmap functionsLogan Gunthorpe2017-07-051-0/+17
| * um: Avoid longjmp/setjmp symbol clashes with libpthread.aFlorian Fainelli2017-07-051-0/+4
| * um: console: Ignore console= optionMasami Hiramatsu2017-07-051-0/+3
| * um: Use os_warn to print out pre-boot warning/error messagesMasami Hiramatsu2017-07-058-24/+26
| * um: Add os_warn() for pre-boot warning/error messagesMasami Hiramatsu2017-07-052-0/+11
| * um: Use os_info for the messages on normal pathMasami Hiramatsu2017-07-054-27/+28
| * um: Add os_info() for pre-boot information messagesMasami Hiramatsu2017-07-052-0/+27
| * um: Use printk instead of printf in make_uml_dirMasami Hiramatsu2017-07-051-4/+7
* | Merge branch 'uaccess.strlen' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-07-061-5/+0
|\ \
| * | kill strlen_user()Al Viro2017-05-151-5/+0
| |/
* | Merge branch 'for-4.13/block' of git://git.kernel.dk/linux-blockLinus Torvalds2017-07-031-1/+1
|\ \
| * | block: introduce new block status code typeChristoph Hellwig2017-06-091-1/+1
| |/
* | arch: remove unused macro/function thread_saved_pc()Tobias Klauser2017-06-282-8/+0
|/
* Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2017-05-135-10/+15
|\
| * um: Add missing NR_CPUS includeRichard Weinberger2017-05-041-0/+1
| * um: Fix to call read_initrd after init_bootmemMasami Hiramatsu2017-05-032-3/+7
| * um: Set number of CPUsNikola Kotur2017-05-032-3/+5
| * um: Fix _print_addr()Richard Weinberger2017-05-031-4/+2
* | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2017-05-011-6/+0
|\ \
| * \ Merge branch 'x86/process' into x86/mm, to create new base for further patchesIngo Molnar2017-03-231-2/+2
| |\ \
OpenPOWER on IntegriCloud