On Wed, 11 Aug 2010, John Johansen wrote:

quoted text
> > -static int apparmor_task_setrlimit(unsigned int resource,
> > -				   struct rlimit *new_rlim)
> > +static int apparmor_task_setrlimit(struct task_struct *task,
> > +		unsigned int resource, struct rlimit *new_rlim)
> >  {
> >  	struct aa_profile *profile = aa_current_profile();
> >  	int error = 0;
> 
> thanks Jiri, I'll get an update for apparmor handling task part out today.
> 
> Signed-off-by: John Johansen <john.johansen@canonical.com>

I added my own merge fix for this before seeing this email -- please send 
me an update against

git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next


-- 
James Morris
<jmorris@namei.org>
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/