Merge branch 'three-eight' of linux:/r/c--/papers/dfopt into three-eight