[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.00.1108121508030.15327@tundra.namei.org>
Date: Fri, 12 Aug 2011 15:08:11 +1000 (EST)
From: James Morris <jmorris@...ei.org>
To: Steve French <smfrench@...il.com>
cc: Stephen Rothwell <sfr@...b.auug.org.au>,
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 Thu, 11 Aug 2011, Steve French wrote:
> If it is easier - I don't mind merging it to cifs now. Seems
> harmless and low risk.
I've applied it to my tree.
>
> On Thu, Aug 11, 2011 at 9:44 PM, James Morris <jmorris@...ei.org> wrote:
> > 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>
> >
>
>
>
> --
> Thanks,
>
> Steve
>
--
James Morris
<jmorris@...ei.org>
Powered by blists - more mailing lists