A few small fixes and then sort and ensure sysreg remains sorted due to
the discussion here [1].

Applies to next-20250115 for the review but I can repost after rc1.

Changes since v1:

  * Use same matching mechanism for both opening and closing tokens so
    also collapse those commits to 1. This now allows trailing
    whitespace on closing tokens which may have been hard to spot (Marc)

[1]: https://lore.kernel.org/all/996c7843-7f51-49a0-9122-e688e37f9902@sirena.org.uk/

James Clark (4):
  arm64/sysreg: Fix unbalanced closing block
  arm64/sysreg: Enforce whole word match for open/close tokens
  arm64/sysreg: Sort sysreg by encoding
  arm64/sysreg: Enforce sorting

 arch/arm64/tools/gen-sysreg.awk |   38 +-
 arch/arm64/tools/sysreg         | 1010 +++++++++++++++----------------
 2 files changed, 529 insertions(+), 519 deletions(-)

-- 
2.34.1

On 15/01/2025 4:25 pm, James Clark wrote:
> A few small fixes and then sort and ensure sysreg remains sorted due to
> the discussion here [1].
> 
> Applies to next-20250115 for the review but I can repost after rc1.
> 
> Changes since v1:
> 
>    * Use same matching mechanism for both opening and closing tokens so
>      also collapse those commits to 1. This now allows trailing
>      whitespace on closing tokens which may have been hard to spot (Marc)
> 
> [1]: https://lore.kernel.org/all/996c7843-7f51-49a0-9122-e688e37f9902@sirena.org.uk/
> 
> James Clark (4):
>    arm64/sysreg: Fix unbalanced closing block
>    arm64/sysreg: Enforce whole word match for open/close tokens
>    arm64/sysreg: Sort sysreg by encoding
>    arm64/sysreg: Enforce sorting
> 
>   arch/arm64/tools/gen-sysreg.awk |   38 +-
>   arch/arm64/tools/sysreg         | 1010 +++++++++++++++----------------
>   2 files changed, 529 insertions(+), 519 deletions(-)
> 

Gentle ping just to say this still applies cleanly to v6.14-rc1

On Wed, 15 Jan 2025 16:25:54 +0000, James Clark wrote:
> A few small fixes and then sort and ensure sysreg remains sorted due to
> the discussion here [1].
> 
> Applies to next-20250115 for the review but I can repost after rc1.
> 
> Changes since v1:
> 
> [...]

Applied to arm64 (for-next/sysreg), thanks!

I'm not convinced about sorting, it makes backporting hard. Most likely
it would also conflict with other patches already queued. So I only
applied the first two patches.

[1/4] arm64/sysreg: Fix unbalanced closing block
      https://git.kernel.org/arm64/c/00cb1e01cd29
[2/4] arm64/sysreg: Enforce whole word match for open/close tokens
      https://git.kernel.org/arm64/c/2fdbf2ff3884

-- 
Catalin