2019-01-18 15:00:59

by Sabyasachi Gupta

[permalink] [raw]
Subject: [PATCH] um: Remove duplicate headers

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

Signed-off-by: Sabyasachi Gupta <[email protected]>
---
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
--
2.7.4



2019-01-18 19:27:17

by Anton Ivanov

[permalink] [raw]
Subject: Re: [PATCH] um: Remove duplicate headers



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 <[email protected]>
> ---
> 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.

2019-01-18 19:44:39

by Richard Weinberger

[permalink] [raw]
Subject: Re: [PATCH] um: Remove duplicate headers

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 <[email protected]>
> > ---
> > 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



2019-01-18 20:08:59

by Anton Ivanov

[permalink] [raw]
Subject: Re: [PATCH] um: Remove duplicate headers



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 <[email protected]>
>>> ---
>>> 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
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-um
>
https://patchwork.ozlabs.org/patch/1020163/

A.

2019-01-18 21:57:57

by Richard Weinberger

[permalink] [raw]
Subject: Re: [PATCH] um: Remove duplicate headers

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
> > [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