Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > Now, the conflicts really do look entirely trivial, and that's not the > problem, but the fact that you *didn't* re-send the AFS pull request > makes me wonder if you perhaps didn't want me to pull it after all? Sorry: Al pointed out that I was incorrectly using lookup_one_len(). I proposed a fix, but he decided that he wanted to rejig lookup_one_len() instead, so I was waiting for that. Al: Can you rebase your vfs/work.dcache branch on top of linus/master (I think the rest of your branch is pulled already)? Or should I just merge together the fscache patches with it and rebase my afs-next branch off of that? David
