diff mbox series

um: Remove duplicate headers

Message ID 5c41e99b.1c69fb81.f240b.506a@mx.google.com
State Superseded
Headers show
Series um: Remove duplicate headers | expand

Commit Message

Sabyasachi Gupta Jan. 18, 2019, 2:58 p.m. UTC
Remove sys/socket.h and sys/uio.h which are included more than once

Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com>
---
 arch/um/drivers/vector_user.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Anton Ivanov Jan. 18, 2019, 7:23 p.m. UTC | #1
On 18/01/2019 14:58, Sabyasachi Gupta wrote:
> Remove sys/socket.h and sys/uio.h which are included more than once
> 
> Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com>
> ---
>   arch/um/drivers/vector_user.c | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c
> index d2c17dd..c863921 100644
> --- a/arch/um/drivers/vector_user.c
> +++ b/arch/um/drivers/vector_user.c
> @@ -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
> 

Hi Sabyasachi,

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

Best Regards,

A.
Richard Weinberger Jan. 18, 2019, 7:42 p.m. UTC | #2
Am Freitag, 18. Januar 2019, 20:23:07 CET schrieb Anton Ivanov:
> 
> On 18/01/2019 14:58, Sabyasachi Gupta wrote:
> > Remove sys/socket.h and sys/uio.h which are included more than once
> > 
> > Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com>
> > ---
> >   arch/um/drivers/vector_user.c | 2 --
> >   1 file changed, 2 deletions(-)
> > 
> > diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c
> > index d2c17dd..c863921 100644
> > --- a/arch/um/drivers/vector_user.c
> > +++ b/arch/um/drivers/vector_user.c
> > @@ -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
> > 
> 
> 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
Anton Ivanov Jan. 18, 2019, 8 p.m. UTC | #3
On 18/01/2019 19:42, Richard Weinberger wrote:
> Am Freitag, 18. Januar 2019, 20:23:07 CET schrieb Anton Ivanov:
>>
>> On 18/01/2019 14:58, Sabyasachi Gupta wrote:
>>> Remove sys/socket.h and sys/uio.h which are included more than once
>>>
>>> Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com>
>>> ---
>>>    arch/um/drivers/vector_user.c | 2 --
>>>    1 file changed, 2 deletions(-)
>>>
>>> diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c
>>> index d2c17dd..c863921 100644
>>> --- a/arch/um/drivers/vector_user.c
>>> +++ b/arch/um/drivers/vector_user.c
>>> @@ -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
>>>
>>
>> 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
> 
> 
> 
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
> 
https://patchwork.ozlabs.org/patch/1020163/

A.
Richard Weinberger Jan. 18, 2019, 9:54 p.m. UTC | #4
Am Freitag, 18. Januar 2019, 21:00:22 CET schrieb Anton Ivanov:
> >> 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
> > 
> > 
> > 
> > _______________________________________________
> > linux-um mailing list
> > linux-um@lists.infradead.org
> > 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
diff mbox series

Patch

diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c
index d2c17dd..c863921 100644
--- a/arch/um/drivers/vector_user.c
+++ b/arch/um/drivers/vector_user.c
@@ -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