The patch titled NetLabel: remove unused function prototypes has been added to the -mm tree. Its filename is netlabel-remove-unused-function-prototypes.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: NetLabel: remove unused function prototypes From: Paul Moore <paul.moore@xxxxxx> Removed some older function prototypes for functions that no longer exist. 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 | 6 ------ 1 files changed, 6 deletions(-) diff -puN include/net/cipso_ipv4.h~netlabel-remove-unused-function-prototypes include/net/cipso_ipv4.h --- a/include/net/cipso_ipv4.h~netlabel-remove-unused-function-prototypes +++ a/include/net/cipso_ipv4.h @@ -200,15 +200,9 @@ static inline int cipso_v4_cache_add(con #ifdef CONFIG_NETLABEL void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway); -int cipso_v4_socket_setopt(struct socket *sock, - unsigned char *opt, - u32 opt_len); int cipso_v4_socket_setattr(const struct socket *sock, const struct cipso_v4_doi *doi_def, const struct netlbl_lsm_secattr *secattr); -int cipso_v4_socket_getopt(const struct socket *sock, - unsigned char **opt, - u32 *opt_len); int cipso_v4_socket_getattr(const struct socket *sock, struct netlbl_lsm_secattr *secattr); int cipso_v4_skbuff_getattr(const struct sk_buff *skb, _ Patches currently in -mm which might be from paul.moore@xxxxxx are git-net.patch netlabel-correctly-initialize-the-netlabel-fields.patch netlabel-remove-unused-function-prototypes.patch netlabel-comment-corrections.patch netlabel-cleanup-ebitmap_import.patch netlabel-uninline-selinux_netlbl_inode_permission.patch netlabel-add-some-missing-includes-to-various-header-files.patch selinux-2-3-change-isec-semaphore-to-a-mutex-vs-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