Hi Mark, Today's linux-next merge of the ocfs2 tree got a conflicts against Linus' tree. I noticed that Linus has merged your tree since I started building linux-next this morning, so I will just drop it for today and assume that it will all be fixed tomorrow. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpYiW8GLcvAH.pgp
Description: PGP signature
