Merge branch 'jk/read-commit-buffer-data-after-free' into pu

Will merge to 'next'.

* jk/read-commit-buffer-data-after-free:
  log: re-encode commit messages before grepping
Merge branch 'mk/old-expat' into pu

* mk/old-expat:
  Allow building with xmlparse.h