Hi Al, Today's linux-next merge of the vfs tree got a conflict in fs/stat.c between commit 55815f70147d ("vfs: make O_PATH file descriptors usable for 'fstat()'") from Linus' tree and commit 19ba95358327 ("switch simple cases of fget_light to fdget") from the vfs tree. I just used the vfs tree version and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpPw2Iu3Cqew.pgp
Description: PGP signature