diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-03 03:39:22 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-03 03:39:22 +0100 |
commit | 6aa293d8ff0939802a6c86cee6cd152c1b0a7a0d (patch) | |
tree | f07bcfb2e44bd8bc0a38c4b0fcc707b6ef1a7ab4 /arch/um/include/asm/Kbuild | |
parent | Merge tag 's390-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390... (diff) | |
parent | um: Remove obsolete reenable_XX calls (diff) | |
download | linux-6aa293d8ff0939802a6c86cee6cd152c1b0a7a0d.tar.xz linux-6aa293d8ff0939802a6c86cee6cd152c1b0a7a0d.zip |
Merge branch 'for-linus-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- DISCARD support for our block device driver
- Many TLB flush optimizations
- Various smaller fixes
- And most important, Anton agreed to help me maintaining UML
* 'for-linus-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Remove obsolete reenable_XX calls
um: writev needs <sys/uio.h>
Add Anton Ivanov to UML maintainers
um: remove redundant generic-y
um: Optimize Flush TLB for force/fork case
um: Avoid marking pages with "changed protection"
um: Skip TLB flushing where not needed
um: Optimize TLB operations v2
um: Remove unnecessary faulted check in uaccess.c
um: Add support for DISCARD in the UBD Driver
um: Remove unsafe printks from the io thread
um: Clean-up command processing in UML UBD driver
um: Switch to block-mq constants in the UML UBD driver
um: Make GCOV depend on !KCOV
um: Include sys/uio.h to have writev()
um: Add HAVE_DEBUG_BUGVERBOSE
um: Update maintainers file entry
Diffstat (limited to 'arch/um/include/asm/Kbuild')
-rw-r--r-- | arch/um/include/asm/Kbuild | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index b10dde6cb793..00bcbe2326d9 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -10,9 +10,7 @@ generic-y += exec.h generic-y += extable.h generic-y += ftrace.h generic-y += futex.h -generic-y += hardirq.h generic-y += hw_irq.h -generic-y += io.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h |