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? Al's pulled it into his tree. I'm hoping he's going to send you a pull request for it. David
