Merge branch 'dev/gfp-flags' into for-chris-4.6

diff --cc fs/btrfs/ctree.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge