Merge branch 'rcu/next' into HEAD

Conflicts:
	include/linux/rcupdate.h