lkml.org 
[lkml]   [2010]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the bkl-vfs tree with the cifs tree
Date
On Tuesday 21 September 2010, Steve French wrote:
> Alternatively - I could merge the trivially modified bkl cifs patch
> into the cifs-2.6.git tree if that is easier

Well, this is the most trivial sort of conflict, I guess we don't have
to worry about it.

Part of my patch reverts part of an earlier patch in the bkl-vfs series
(by design, not by accident).
We could sort that out, but my feeling is that it's not worth it.

Arnd


\
 
 \ /
  Last update: 2010-09-21 10:03    [W:0.046 / U:1.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site