BUG: linux-rpi5-16k build fails

[replabrobin]

I'm trying to build a linux kernel from source using core/linux-rpi-16k to 6.18.17-2 PKG

I get this error when the build tries to apply 0002-media-rpi_hevc_dec-fix-data_byte_offset-handling.patch

[code]
==> Extracting sources...
-> Extracting linux-6.18.17-96ee9b0b18.tar.gz with bsdtar
==> Starting prepare()...
patching file arch/arm64/kernel/cpuinfo.c
can't find file to patch at input line 15
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|#From 9a983e16eb2aa2e503eb3d8b61c40874d2723da7 Mon Sep 17 00:00:00 2001
|#From: amphiprion-symb <amphiprion@posteo.de>
|#Date: Sun, 8 Mar 2026 11:35:15 +0100
|#Subject: [PATCH] media: rpi_hevc_dec: fix `data_byte_offset` handling breaking
|# HEVC playback
|#
|#---
|# .../media/platform/raspberrypi/hevc_dec/hevc_d_h265.c | 11 ++++++-----
|# 1 file changed, 6 insertions(+), 5 deletions(-)
|#
|diff --git a/src/linux-570585aff0b29caaba82466918e12b7f69e4276b/drivers/media/platform/raspberrypi/hevc_dec/hevc_d_h265.c b/src/linux-570585aff0b29caaba82466918e12b7f69e4276b/drivers/media/platform/raspberrypi/hevc_dec/hevc_d_h265.c
|index b86c935e8..3b31dd364 100644
|--- a/src/linux-570585aff0b29caaba82466918e12b7f69e4276b/drivers/media/platform/raspberrypi/hevc_dec/hevc_d_h265.c
|+++ b/src/linux-570585aff0b29caaba82466918e12b7f69e4276b/drivers/media/platform/raspberrypi/hevc_dec/hevc_d_h265.c
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
==> ERROR: A failure occurred in prepare().
Aborting...
[/code]

[replabrobin]

By trial and error I find that this 0002 patch needs to use -Np3 rather than -Np1. I'm not exactly sure why this works, but I notice that the kernel commit in the patch is not the same as in the PKGBUILD so perhaps that's the reason.