From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+willy=40w.ods.org-S1751340AbWF2Awc@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751340AbWF2Awc (ORCPT <rfc822;willy@w.ods.org>);
	Wed, 28 Jun 2006 20:52:32 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751845AbWF2Awc
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Wed, 28 Jun 2006 20:52:32 -0400
Received: from smtp.osdl.org ([65.172.181.4]:50909 "EHLO smtp.osdl.org")
	by vger.kernel.org with ESMTP id S1751340AbWF2Awb (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 28 Jun 2006 20:52:31 -0400
Date: Wed, 28 Jun 2006 17:55:51 -0700
From: Andrew Morton <akpm@osdl.org>
To: James Morris <jmorris@namei.org>
Cc: chrisw@sous-sol.org, linux-kernel@vger.kernel.org, sds@tycho.nsa.gov,
       dpquigl@tycho.nsa.gov
Subject: Re: [PATCH 1/3] SELinux: Extend task_kill hook to handle signals
 sent by AIO completion
Message-Id: <20060628175551.33737310.akpm@osdl.org>
In-Reply-To: <Pine.LNX.4.64.0606282034110.17541@d.namei>
References: <Pine.LNX.4.64.0606281943240.17149@d.namei>
	<20060629001628.GQ11588@sequoia.sous-sol.org>
	<Pine.LNX.4.64.0606282034110.17541@d.namei>
X-Mailer: Sylpheed version 1.0.0 (GTK+ 1.2.10; i386-vine-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

James Morris <jmorris@namei.org> wrote:
>
> On Wed, 28 Jun 2006, Chris Wright wrote:
> 
> > > diff -uprN -X /home/dpquigl/dontdiff linux-2.6.17-mm3/security/selinux/hooks.c linux-2.6.17-mm3-kill/security/selinux/hooks.c
> > > --- linux-2.6.17-mm3/security/selinux/hooks.c	2006-06-28 13:58:59.000000000 -0400
> > > +++ linux-2.6.17-mm3-kill/security/selinux/hooks.c	2006-06-28 14:40:00.000000000 -0400
> > > @@ -45,6 +45,7 @@
> > >  #include <linux/kd.h>
> > >  #include <linux/netfilter_ipv4.h>
> > >  #include <linux/netfilter_ipv6.h>
> > > +#include <linux/selinux.h>
> > 
> > It's already included.
> 
> Not in the current Linus git tree.
> 
> $ cat .git/refs/heads/master
> 27d68a36c4f1ca2fc6be82620843493462c08c51
> 
> $ grep selinux\\.h security/selinux/hooks.c
> 

Catherine's AF_UNIX patch adds the same include.

What's the relative importance/safety on all of these patches, btw?  Does
Catherine go first?