The patch titled
NetLabel: add some missing #includes to various header files
has been removed from the -mm tree. Its filename is
netlabel-add-some-missing-includes-to-various-header-files.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: NetLabel: add some missing #includes to various header files
From: Paul Moore <paul.moore@xxxxxx>
Add some missing include files to the NetLabel related header files.
Signed-off-by: Paul Moore <paul.moore@xxxxxx>
Acked-by: James Morris <jmorris@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/net/cipso_ipv4.h | 2 ++
include/net/netlabel.h | 1 +
net/netlabel/netlabel_domainhash.h | 4 ++++
net/netlabel/netlabel_user.h | 5 +++--
security/selinux/include/selinux_netlabel.h | 9 +++++++++
5 files changed, 19 insertions(+), 2 deletions(-)
diff -puN include/net/cipso_ipv4.h~netlabel-add-some-missing-includes-to-various-header-files include/net/cipso_ipv4.h
--- a/include/net/cipso_ipv4.h~netlabel-add-some-missing-includes-to-various-header-files
+++ a/include/net/cipso_ipv4.h
@@ -37,6 +37,8 @@
#include <linux/types.h>
#include <linux/rcupdate.h>
#include <linux/list.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
#include <net/netlabel.h>
/* known doi values */
diff -puN include/net/netlabel.h~netlabel-add-some-missing-includes-to-various-header-files include/net/netlabel.h
--- a/include/net/netlabel.h~netlabel-add-some-missing-includes-to-various-header-files
+++ a/include/net/netlabel.h
@@ -31,6 +31,7 @@
#define _NETLABEL_H
#include <linux/types.h>
+#include <linux/net.h>
#include <linux/skbuff.h>
#include <net/netlink.h>
diff -puN net/netlabel/netlabel_domainhash.h~netlabel-add-some-missing-includes-to-various-header-files net/netlabel/netlabel_domainhash.h
--- a/net/netlabel/netlabel_domainhash.h~netlabel-add-some-missing-includes-to-various-header-files
+++ a/net/netlabel/netlabel_domainhash.h
@@ -32,6 +32,10 @@
#ifndef _NETLABEL_DOMAINHASH_H
#define _NETLABEL_DOMAINHASH_H
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+
/* Domain hash table size */
/* XXX - currently this number is an uneducated guess */
#define NETLBL_DOMHSH_BITSIZE 7
diff -puN net/netlabel/netlabel_user.h~netlabel-add-some-missing-includes-to-various-header-files net/netlabel/netlabel_user.h
--- a/net/netlabel/netlabel_user.h~netlabel-add-some-missing-includes-to-various-header-files
+++ a/net/netlabel/netlabel_user.h
@@ -31,11 +31,12 @@
#ifndef _NETLABEL_USER_H
#define _NETLABEL_USER_H
+#include <linux/types.h>
#include <linux/skbuff.h>
#include <linux/capability.h>
-#include <linux/genetlink.h>
-#include <net/netlabel.h>
+#include <net/netlink.h>
#include <net/genetlink.h>
+#include <net/netlabel.h>
/* NetLabel NETLINK helper functions */
diff -puN security/selinux/include/selinux_netlabel.h~netlabel-add-some-missing-includes-to-various-header-files security/selinux/include/selinux_netlabel.h
--- a/security/selinux/include/selinux_netlabel.h~netlabel-add-some-missing-includes-to-various-header-files
+++ a/security/selinux/include/selinux_netlabel.h
@@ -27,6 +27,15 @@
#ifndef _SELINUX_NETLABEL_H_
#define _SELINUX_NETLABEL_H_
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+
+#include "avc.h"
+#include "objsec.h"
+
#ifdef CONFIG_NETLABEL
void selinux_netlbl_cache_invalidate(void);
int selinux_netlbl_socket_post_create(struct socket *sock,
_
Patches currently in -mm which might be from paul.moore@xxxxxx are
git-net.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
