sync usr/src/.gitignore with latest -gate merges