release 2022-07-18 kernel patch fails

[shayne]

Building with 2022-07-18 changes results in build failure. Was the release kernel built on the same sha in the kernel package.nix? Looks like the Sven 4k patch no longer lines up.

patching script interpreter paths in scripts/ld-version.sh
scripts/ld-version.sh: interpreter directive changed from "#!/bin/sh" to "/nix/store/191yw2v0ys0qx3l8wlq5mh6ck968naf2-bash-5.1-p16/bin/sh"
applying patch /nix/store/54dzq4f942069fgckvhvcjwapcpcxha6-sven-iommu-4k.patch
patching file drivers/iommu/apple-dart.c
Hunk #1 succeeded at 196 (offset 99 lines).
Hunk #2 succeeded at 215 with fuzz 2 (offset 101 lines).
Hunk #3 succeeded at 663 (offset 166 lines).
Hunk #4 succeeded at 791 (offset 166 lines).
Hunk #5 succeeded at 895 (offset 166 lines).
Hunk #6 FAILED at 898.
Hunk #7 FAILED at 922.
2 out of 7 hunks FAILED -- saving rejects to file drivers/iommu/apple-dart.c.rej
patching file drivers/iommu/dma-iommu.c
Hunk #1 FAILED at 20.
Hunk #2 succeeded at 721 (offset 11 lines).
Hunk #3 succeeded at 763 (offset 11 lines).
Hunk #4 FAILED at 799.
Hunk #5 succeeded at 834 (offset 12 lines).
Hunk #6 FAILED at 842.
Hunk #7 succeeded at 1086 (offset 17 lines).
Hunk #8 succeeded at 1129 (offset 17 lines).
Hunk #9 succeeded at 1217 (offset 17 lines).
Hunk #10 succeeded at 1464 (offset 17 lines).
3 out of 10 hunks FAILED -- saving rejects to file drivers/iommu/dma-iommu.c.rej
patching file drivers/iommu/iommu.c
Hunk #1 succeeded at 81 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 1960 with fuzz 2 (offset -18 lines).
Hunk #3 succeeded at 1987 (offset -18 lines).
patching file drivers/iommu/iova.c
patching file include/linux/iommu.h
Hunk #3 succeeded at 106 with fuzz 2.

[tpwrules]

I have not had occasion to build a 4k kernel in some time, so it's not surprising that it is broken. I only built (and tested) the 16k kernel before releasing.

It is my (possibly flawed) understanding that most of the 4k-only software is now updated. Have you re-tested recently?

I don't really have time or skills to address it myself, but if you want to find or make and file a PR for an updated patch, I would gladly accept it. Otherwise, I will likely soon remove the capability.

[shayne]

I still run 4k for various GUI apps that are still not updated (telegram and codium).

Currently running with updated patch:

❯ uname -a
Linux m1nix 5.19.0-rc5-asahi #1-NixOS SMP PREEMPT Tue Jan 1 00:00:00 UTC 1980 aarch64 GNU/Linux

❯ getconf PAGESIZE
4096