Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: linux-next: manual merge of the bkl-vfs tree with the cifs tree | Date | Tue, 21 Sep 2010 09:59:49 +0200 |
| |
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
| |