diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-15 15:07:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-15 15:07:32 -0700 |
| commit | 6c83d0d5eb62846b8591884e246ab67d70b651ef (patch) | |
| tree | 320a837cb7384d01326001956f655b812fc6cd5d /arch/um/drivers/vector_user.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | um: Fix for a possible OOPS in ubd initialization (diff) | |
| download | linux-dev-6c83d0d5eb62846b8591884e246ab67d70b651ef.tar.xz linux-dev-6c83d0d5eb62846b8591884e246ab67d70b651ef.zip | |
Merge branch 'for-linus-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
"Bugfix for the UML block device driver"
* 'for-linus-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix for a possible OOPS in ubd initialization
um: Remove duplicated include from vector_user.c
Diffstat (limited to 'arch/um/drivers/vector_user.c')
| -rw-r--r-- | arch/um/drivers/vector_user.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c index d2c17dd74620..b3f7b3ca896d 100644 --- a/arch/um/drivers/vector_user.c +++ b/arch/um/drivers/vector_user.c @@ -16,14 +16,12 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <sys/types.h> #include <sys/socket.h> #include <net/ethernet.h> #include <netinet/ip.h> #include <netinet/ether.h> #include <linux/if_ether.h> #include <linux/if_packet.h> -#include <sys/socket.h> #include <sys/wait.h> #include <sys/uio.h> #include <linux/virtio_net.h> @@ -31,7 +29,6 @@ #include <stdlib.h> #include <os.h> #include <um_malloc.h> -#include <sys/uio.h> #include "vector_user.h" #define ID_GRE 0 |