Merge branch 'next' into master

Conflicts:
	uapi/linux/if_link.h