tree e09cbbf3ed63f4f26f6cb9686eb787aa41696315
parent 2847f879aab89305e1f21def883c57ef0144195a
parent 2f7f574cfa568a8e04edbd3fe26339d2e1f85906
author Gilles Peskine <gilles.peskine@arm.com> 1626963662 +0200
committer GitHub <noreply@github.com> 1626963662 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJg+X7OCRBK7hj4Ov3rIwAAecIIAHJh3HPtluvkOFoq9TO0cLzG
 3XPy5f7q3y/yuhj1WHHxCU88oAkVRA4X6S/MHkivAUf8/p2wv5XjLGq8a33D92Dw
 Wuc7yw4pSO2AgWKwtjO9c/m8LheoRnk+jkl6Mm2LUbpRIGT5LfPhDtftGRRxQHTd
 FA5rVbKBE6SBgAaEPQj1iFHsZP5O7xSXNncDqBMr44qdCSKmqQX5Exmr1tVtfhI5
 l5Ggr5m09QW7BWxLoJJjqDZKoNwIBWnyjwVriQAog13JyZUXgxgMsoX44evoiX4r
 7xiIILee1hLuiAFQbapQgjqw2CdOS6yYAtLVP6LDpwgRZYKVrdsBBjlQiF1jA0U=
 =W2gn
 -----END PGP SIGNATURE-----
 

Merge pull request #4778 from yutotakano/fix-reserved-identifier-clash-2.16

Backport 2.16: Replace reserved identifier clashes with suitable replacements