diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-14 20:17:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-14 20:17:34 -0400 |
| commit | f2772a0e4833d1af1901b6f1a38136fb71d1350c (patch) | |
| tree | 28bf6f0944d745e19947273022224ebc6b2d07c8 /arch/um/drivers/ssl.c | |
| parent | fcd98147ac71f35b69e2f50b5fddc5524dd2dfa8 (diff) | |
| parent | b482e48d29f1461fd0d059a17f32bcfa274127b3 (diff) | |
Merge tag 'for-linus-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- A new timer mode, time travel, for testing with UML
- Many bugixes/improvements for the serial line driver
- Various bugfixes
* tag 'for-linus-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT
um: Fix kcov crash during startup
um: configs: Remove useless UEVENT_HELPER_PATH
um: Support time travel mode
um: Pass nsecs to os timer functions
um: Remove drivers/ssl.h
um: Don't garbage collect in deactivate_all_fds()
um: Silence lockdep complaint about mmap_sem
um: Remove locking in deactivate_all_fds()
um: Timer code cleanup
um: fix os_timer_one_shot()
um: Fix IRQ controller regression on console read
Diffstat (limited to 'arch/um/drivers/ssl.c')
| -rw-r--r-- | arch/um/drivers/ssl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index b8d14fa52059..7ae407d5337e 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/console.h> | 12 | #include <linux/console.h> |
| 13 | #include <asm/termbits.h> | 13 | #include <asm/termbits.h> |
| 14 | #include <asm/irq.h> | 14 | #include <asm/irq.h> |
| 15 | #include "ssl.h" | ||
| 16 | #include "chan.h" | 15 | #include "chan.h" |
| 17 | #include <init.h> | 16 | #include <init.h> |
| 18 | #include <irq_user.h> | 17 | #include <irq_user.h> |