Speaking of conflicts... Here's another half of a do_utimes() patch, same story as on ppc64:
Attach a file by drag & drop or click to upload
