Merge reason: Add these commits so that fixes on this branch do not
	conflict with already-mainlined code.
Signed-off-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>