[PATCH 1/2] maint: update for linux v6.16

[Gleb Fotengauer-Malinovskiy]

* maint/ioctls_sym.sh: Add workarounds for asm/ioctls.h and
drm/nova_drm.h headers.

Co-authored-by: Dmitry V. Levin <ldv at strace.io>
---
 maint/ioctls_sym.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh
index d03e8f36c..357ed1dae 100755
--- a/maint/ioctls_sym.sh
+++ b/maint/ioctls_sym.sh
@@ -344,6 +344,14 @@ process_file()
 					;;
 			esac
 			;;
+		*asm/ioctls.h)
+			case "$uname_m" in
+				ppc*)
+					# Revert Linux commit v6.16-rc3~41^2.
+					sed 's/^\(#define[[:space:]]\+[^[:space:]]\+[[:space:]]\+\)0x[[:xdigit:]]\+[[:space:]]\+\/\*[[:space:]]\+\([^*]\+struct termio)\) \*\//\1\2/' \
+						< "$s" > "$tmpdir/$f"
+			esac
+			;;
 		*acpi/*|*linux/i2o.h|*media*/exynos-fimc.h|*media/v4l2-subdev.h|*net/bluetooth/*|net/nfc/nci_core.h)
 			# Fetch macros only.
 			grep "${r_define}${r_cmd_name}" < "$s" > "$tmpdir/$f"
@@ -379,6 +387,14 @@ process_file()
 				s/^\(#define .*,\)$/\1 \\/p
 				s/^\([[:space:]]\+[^),]\+)\),$/\1/p' >> "$tmpdir/$f"
 			;;
+		*drm/nova_drm.h)
+			sed -E '/^enum /,/^};/d' < "$s" > "$tmpdir/$f"
+			sed -En '/^enum /,/^};/ s/^[[:space:]].*/&/p' < "$s" |
+			sed -n 's/^[[:space:]]*\([A-Z][A-Z_0-9]*\)[[:space:]]*=[[:space:]]*\(DRM_\(IO\|IOW\|IOR\|IOWR\|IOC\)\)[[:space:]]*(/#define \1 \2(/
+				s/^\(#define .*)\),$/\1/p
+				s/^\(#define .*,\)$/\1 \\/p
+				s/^\([[:space:]]\+[^),]\+)\),$/\1/p' >> "$tmpdir/$f"
+			;;
 		*linux/dma-buf.h)
 			# Filter out duplicates.
 			sed '/\<DMA_BUF_SET_NAME\>/d' < "$s" > "$tmpdir/$f"
-- 
glebfm