Merge commit '30e2ea2'

With:

  $ git merge -s ours --log 30e2ea2

because we don't want to remove the Linux pointer field adjustments
from the backported commit.

* commit '30e2ea2':
  Check pointer fields of g.spec