Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2025

The official capitalisation is “AArch”,
see https://developer.arm.com/documentation/102374/latest/.


As noted by @ulysses4ever in #11033. Addition in #10705 by @GulinSS (who might want to tell us if he is OK with the change)

The official capitalisation is “AArch”,
see https://developer.arm.com/documentation/102374/latest/.

(cherry picked from commit 48c2d4c)

# Conflicts:
#	changelog.d/pr-10705
@mergify mergify bot added the conflicts label Jul 9, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jul 9, 2025

Cherry-pick of 48c2d4c has failed:

On branch mergify/bp/3.16/pr-11047
Your branch is up to date with 'origin/3.16'.

You are currently cherry-picking commit 48c2d4c2c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cabal/src/Distribution/Simple/Build/PathsModule.hs
	modified:   Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs
	modified:   cabal-dev-scripts/src/GenPathsModule.hs
	modified:   templates/Paths_pkg.template.hs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelog.d/pr-10705

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jul 9, 2025
5 tasks
@mergify mergify bot added the backport label Jul 9, 2025
@ffaf1 ffaf1 closed this Jul 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants