include/linux: Remove duplicate header

Message ID 20190110160114.GA5641@hp-pavilion-15-notebook-pc-brajeswar
State Not Applicable
Delegated to: David Miller
Headers show
Series
  • include/linux: Remove duplicate header
Related show

Commit Message

Brajeswar Ghosh Jan. 10, 2019, 4:01 p.m.
Remove duplicate headers which are included more than once

Signed-off-by: Brajeswar Ghosh <brajeswar.linux@gmail.com>
---
 include/linux/perf_event.h | 1 -
 include/linux/ptr_ring.h   | 1 -
 include/linux/qed/qed_if.h | 1 -
 include/linux/security.h   | 1 -
 4 files changed, 4 deletions(-)

Comments

Michael S. Tsirkin Jan. 10, 2019, 7:19 p.m. | #1
On Thu, Jan 10, 2019 at 09:31:14PM +0530, Brajeswar Ghosh wrote:
> Remove duplicate headers which are included more than once
> 
> Signed-off-by: Brajeswar Ghosh <brajeswar.linux@gmail.com>
> ---
>  include/linux/perf_event.h | 1 -
>  include/linux/ptr_ring.h   | 1 -
>  include/linux/qed/qed_if.h | 1 -
>  include/linux/security.h   | 1 -
>  4 files changed, 4 deletions(-)
> 
> diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
> index 53c500f0ca79..8d7a2b65514b 100644
> --- a/include/linux/perf_event.h
> +++ b/include/linux/perf_event.h
> @@ -53,7 +53,6 @@ struct perf_guest_info_callbacks {
>  #include <linux/atomic.h>
>  #include <linux/sysfs.h>
>  #include <linux/perf_regs.h>
> -#include <linux/workqueue.h>
>  #include <linux/cgroup.h>
>  #include <asm/local.h>
>  
> diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
> index 6894976b54e3..627b7aa067e0 100644
> --- a/include/linux/ptr_ring.h
> +++ b/include/linux/ptr_ring.h
> @@ -26,7 +26,6 @@
>  #include <linux/cache.h>
>  #include <linux/types.h>
>  #include <linux/compiler.h>
> -#include <linux/cache.h>
>  #include <linux/slab.h>
>  #include <asm/errno.h>
>  #endif


Acked-by: Michael S. Tsirkin <mst@redhat.com>


Pls merge through the trivial tree or similar.


> diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h
> index a47321a0d572..9ebdb60f605a 100644
> --- a/include/linux/qed/qed_if.h
> +++ b/include/linux/qed/qed_if.h
> @@ -38,7 +38,6 @@
>  #include <linux/netdevice.h>
>  #include <linux/pci.h>
>  #include <linux/skbuff.h>
> -#include <linux/types.h>
>  #include <asm/byteorder.h>
>  #include <linux/io.h>
>  #include <linux/compiler.h>
> diff --git a/include/linux/security.h b/include/linux/security.h
> index ac0ef467d25e..2915ea6a5b77 100644
> --- a/include/linux/security.h
> +++ b/include/linux/security.h
> @@ -30,7 +30,6 @@
>  #include <linux/err.h>
>  #include <linux/string.h>
>  #include <linux/mm.h>
> -#include <linux/fs.h>
>  
>  struct linux_binprm;
>  struct cred;
> -- 
> 2.17.1
Brajeswar Ghosh Jan. 30, 2019, 2:30 p.m. | #2
On Fri, Jan 11, 2019 at 12:50 AM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> On Thu, Jan 10, 2019 at 09:31:14PM +0530, Brajeswar Ghosh wrote:
> > Remove duplicate headers which are included more than once
> >
> > Signed-off-by: Brajeswar Ghosh <brajeswar.linux@gmail.com>
> > ---
> >  include/linux/perf_event.h | 1 -
> >  include/linux/ptr_ring.h   | 1 -
> >  include/linux/qed/qed_if.h | 1 -
> >  include/linux/security.h   | 1 -
> >  4 files changed, 4 deletions(-)
> >
> > diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
> > index 53c500f0ca79..8d7a2b65514b 100644
> > --- a/include/linux/perf_event.h
> > +++ b/include/linux/perf_event.h
> > @@ -53,7 +53,6 @@ struct perf_guest_info_callbacks {
> >  #include <linux/atomic.h>
> >  #include <linux/sysfs.h>
> >  #include <linux/perf_regs.h>
> > -#include <linux/workqueue.h>
> >  #include <linux/cgroup.h>
> >  #include <asm/local.h>
> >
> > diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
> > index 6894976b54e3..627b7aa067e0 100644
> > --- a/include/linux/ptr_ring.h
> > +++ b/include/linux/ptr_ring.h
> > @@ -26,7 +26,6 @@
> >  #include <linux/cache.h>
> >  #include <linux/types.h>
> >  #include <linux/compiler.h>
> > -#include <linux/cache.h>
> >  #include <linux/slab.h>
> >  #include <asm/errno.h>
> >  #endif
>
>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
>
>
> Pls merge through the trivial tree or similar.

If no further comment, can we get this patch in queue for 5.1 ?

>
>
> > diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h
> > index a47321a0d572..9ebdb60f605a 100644
> > --- a/include/linux/qed/qed_if.h
> > +++ b/include/linux/qed/qed_if.h
> > @@ -38,7 +38,6 @@
> >  #include <linux/netdevice.h>
> >  #include <linux/pci.h>
> >  #include <linux/skbuff.h>
> > -#include <linux/types.h>
> >  #include <asm/byteorder.h>
> >  #include <linux/io.h>
> >  #include <linux/compiler.h>
> > diff --git a/include/linux/security.h b/include/linux/security.h
> > index ac0ef467d25e..2915ea6a5b77 100644
> > --- a/include/linux/security.h
> > +++ b/include/linux/security.h
> > @@ -30,7 +30,6 @@
> >  #include <linux/err.h>
> >  #include <linux/string.h>
> >  #include <linux/mm.h>
> > -#include <linux/fs.h>
> >
> >  struct linux_binprm;
> >  struct cred;
> > --
> > 2.17.1

Patch

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 53c500f0ca79..8d7a2b65514b 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -53,7 +53,6 @@  struct perf_guest_info_callbacks {
 #include <linux/atomic.h>
 #include <linux/sysfs.h>
 #include <linux/perf_regs.h>
-#include <linux/workqueue.h>
 #include <linux/cgroup.h>
 #include <asm/local.h>
 
diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
index 6894976b54e3..627b7aa067e0 100644
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h
@@ -26,7 +26,6 @@ 
 #include <linux/cache.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
-#include <linux/cache.h>
 #include <linux/slab.h>
 #include <asm/errno.h>
 #endif
diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h
index a47321a0d572..9ebdb60f605a 100644
--- a/include/linux/qed/qed_if.h
+++ b/include/linux/qed/qed_if.h
@@ -38,7 +38,6 @@ 
 #include <linux/netdevice.h>
 #include <linux/pci.h>
 #include <linux/skbuff.h>
-#include <linux/types.h>
 #include <asm/byteorder.h>
 #include <linux/io.h>
 #include <linux/compiler.h>
diff --git a/include/linux/security.h b/include/linux/security.h
index ac0ef467d25e..2915ea6a5b77 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -30,7 +30,6 @@ 
 #include <linux/err.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/fs.h>
 
 struct linux_binprm;
 struct cred;