[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.00.1108121244250.14779@tundra.namei.org>
Date: Fri, 12 Aug 2011 12:44:55 +1000 (EST)
From: James Morris <jmorris@...ei.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
cc: Steve French <smfrench@...il.com>,
Mimi Zohar <zohar@...ux.vnet.ibm.com>,
Eric Paris <eparis@...isplace.org>,
linux-security-module@...r.kernel.org, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-cifs@...r.kernel.org,
David Safford <safford@...son.ibm.com>,
Mimi Zohar <zohar@...ibm.com>
Subject: Re: [PATCH] CIFS: remove local xattr definitions
On Fri, 12 Aug 2011, Stephen Rothwell wrote:
> Except then that could leave Linus' tree broken during the next merge
> window depending on the order he merges the cifs and security-testing
> trees. Unless that patch is sent to Linus as a fix patch before the next
> merge window, of course.
>
> I will add this patch as a merge fixup to the merge of the
> security-testing tree for today. And will remove my copy when one of the
> trees gets fixed.
I'll put it in my tree, then.
> James: maybe I should change the name of your tree in -next to just
> "security"?
Sure.
--
James Morris
<jmorris@...ei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists