Hi all, Today's linux-next merge of the btrfs tree got a conflict in fs/btrfs/acl.c between commit 996a710d4641 ("btrfs: use generic posix ACL infrastructure") from the tree and commit cfad95253440 ("btrfs: remove dead code") from the btrfs tree.
I fixed it up (I used the version from Linus' tree) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpDX3OxaiJ26.pgp
Description: PGP signature