Hi Al, Today's linux-next merge of the vfs tree got a conflict in fs/ext4/extents.c between rebased versions of commits from Linus' and the ext4 trees and the same commits from the vfs tree. I fixed it up (I just used the version from Linus' and the ext4 trees) and can carry the fix as necessary (no action is required). Al, this is why I asked you about checking with Ted about his tree being rebased after you merged it into yours ... -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpe5f_bAUqDU.pgp
Description: PGP signature
