lkml.org 
[lkml]   [2011]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@namei.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@namei.org>
> >
>
>
>
> --
> Thanks,
>
> Steve
>

--
James Morris
<jmorris@namei.org>
\
 
 \ /
  Last update: 2011-08-12 07:15    [W:0.035 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site