Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
kernel/auditsc.c between commit fcf22d8267ad ("audit: create private
file name copies when auditing inodes") from Linus' tree and various
commits from the vfs tree.I fixed it up (I used the vfs tree version as advised by Al) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected]
pgpAJajBiBIk8.pgp
Description: OpenPGP digital signature
