Conflicts:
	Documentation/driver-api/dmaengine/provider.rst
	include/linux/dmaengine.h