There were three.
```
$ git diff -U0 upstream/master | pep8 --diff
./lib/iris/analysis/calculus.py:323:46: W291 trailing whitespace
./lib/iris/fileformats/manager.py:184:1: W293 blank line contains whitespace
./lib/iris/tests/test_trajectory.py:160:1: W293 blank line contains whitespace
```
Line numbers might be off as this is post-merge.