Merge tag 'v4.2.8' into zygo-4.2.8-zb64

This is the 4.2.8 stable release

Conflicts:
	fs/btrfs/ioctl.c

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

diff --cc fs/btrfs/extent-tree.c
Simple merge

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

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

diff --cc fs/btrfs/tree-log.c
Simple merge