update usr/src/.gitignore with latest merges