Skip to contentSkip to conversation

um: Remove duplicate headers

PATCH In review Sabyasachi Gupta 3 participants 5 messages Jan 18, 2019 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 um: Remove duplicate headers

Remove sys/socket.h and sys/uio.h which are included more than once

---
 arch/um/drivers/vector_user.c | 2 --
 1 file changed, 2 deletions(-)
arch/um/drivers/vector_user.c +0 -2
index d2c17dd..c863921 100644
@@ -23,7 +23,6 @@
 #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 +30,6 @@
 #include <stdlib.h>
 #include <os.h>
 #include <um_malloc.h>
-#include <sys/uio.h>
 #include "vector_user.h"
 
 #define ID_GRE 0
Signature · 7 lines
2.7.4


_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
maintainer
#1 lore raw
Quoted 21 lines · Sabyasachi Gupta

Remove sys/socket.h and sys/uio.h which are included more than once

---
  arch/um/drivers/vector_user.c | 2 --
  1 file changed, 2 deletions(-)
arch/um/drivers/vector_user.c +0 -1
index d2c17dd..c863921 100644
@@ -23,7 +23,6 @@
  #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>

arch/um/drivers/vector_user.c line 35

Quoted 7 lines
arch/um/drivers/vector_user.c +0 -1
@@ -31,7 +30,6 @@
  #include <stdlib.h>
  #include <os.h>
  #include <um_malloc.h>
-#include <sys/uio.h>
  #include "vector_user.h"
 
  #define ID_GRE 0

Hi Sabyasachi,

I believe we have an identical patch enqueued already from a couple of weeks back.

Best Regards,

A.

#2 lore raw

Am Freitag, 18. Januar 2019, 20:23:07 CET schrieb Anton Ivanov:

Quoted 28 lines · Sabyasachi Gupta
Quoted 26 lines

Remove sys/socket.h and sys/uio.h which are included more than once

---
  arch/um/drivers/vector_user.c | 2 --
  1 file changed, 2 deletions(-)
arch/um/drivers/vector_user.c +0 -2
index d2c17dd..c863921 100644
@@ -23,7 +23,6 @@
  #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 +30,6 @@
  #include <stdlib.h>
  #include <os.h>
  #include <um_malloc.h>
-#include <sys/uio.h>
  #include "vector_user.h"
 
Quoted 7 lines

arch/um/drivers/vector_user.c line 35

Quoted 2 lines
arch/um/drivers/vector_user.c +0 -0
  #define ID_GRE 0

Hi Sabyasachi,

I believe we have an identical patch enqueued already from a couple of weeks back.

Hmm, did I miss that one in patchwork?

Thanks,
//richard

maintainer
#3 lore raw
Quoted 44 lines · Richard Weinberger

Am Freitag, 18. Januar 2019, 20:23:07 CET schrieb Anton Ivanov:

Quoted 28 lines · Sabyasachi Gupta
Quoted 26 lines

Remove sys/socket.h and sys/uio.h which are included more than once

---
   arch/um/drivers/vector_user.c | 2 --
   1 file changed, 2 deletions(-)
arch/um/drivers/vector_user.c +0 -2
index d2c17dd..c863921 100644
@@ -23,7 +23,6 @@
   #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 +30,6 @@
   #include <stdlib.h>
   #include <os.h>
   #include <um_malloc.h>
-#include <sys/uio.h>
   #include "vector_user.h"
 
Quoted 7 lines

arch/um/drivers/vector_user.c line 35

Quoted 2 lines
arch/um/drivers/vector_user.c +0 -0
   #define ID_GRE 0

Hi Sabyasachi,

I believe we have an identical patch enqueued already from a couple of weeks back.

Hmm, did I miss that one in patchwork?

Thanks,
//richard

Quoted 5 lines

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

https://patchwork.ozlabs.org/patch/1020163/

A.

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#4 lore raw

Am Freitag, 18. Januar 2019, 21:00:22 CET schrieb Anton Ivanov:

Quoted 12 lines
Quoted 12 lines
Quoted 4 lines

Hi Sabyasachi,

I believe we have an identical patch enqueued already from a couple of weeks back.

Hmm, did I miss that one in patchwork?

Thanks,
//richard

Quoted 6 lines
Quoted 5 lines

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

https://patchwork.ozlabs.org/patch/1020163/

Ahh, I thought I forgot this for the last merge window. Now things make sense again.

Anton, can you please test/Ack the patch? Then it can go to -next.

Thanks,
//richard

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um