It seems to me that most of the patch conflicts are mechanical
and could be merged mechanically.
However I believe that the documentation change to this comment is important:
I scratched my head for a while to figure out that AT_NOTELF also was
a subtraction as far as AT_VECTOR_SIZE_BASE was concerned.
John Reiser, jreiser@BitWagon.com