[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110812114919.2797815cf41cd69048e1d3cf@canb.auug.org.au>
Date: Fri, 12 Aug 2011 11:49:19 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: James Morris <jmorris@...ei.org>
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
Hi all,
On Fri, 12 Aug 2011 10:48:27 +1000 (EST) James Morris <jmorris@...ei.org> wrote:
>
> On Thu, 11 Aug 2011, Steve French wrote:
>
> > makes sense - do we want this going through the cifs tree or as part
> > of the xattr change mentioned below.
>
> Should be fine to go into the CIFS tree, as long as that is in -next.
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.
James: maybe I should change the name of your tree in -next to just
"security"?
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists