Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > It looks like the afs tree has been rebased since (part of) it was merged > into the vfs-brauner tree. :-( What's the best way to deal with this? Push these two patches down to the bottom of the branches and then base both trees off those two same commits? David
