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


\
 
 \ /
  Last update: 2011-08-12 04:47    [W:7.149 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site