Debian 12.5 upgrade error

[Alexis Grigoriou <alexis@nanoid.net>]

 I have encountered an error upgrading to 12.5 from 12.4 regarding the
nvidia-driver and linux-image 6.1.0.18. The error is:

env NV_VERBOSE=1 make -j8 modules KERNEL_UNAME=6.1.0-18-
amd64............(bad exit status: 2)

I get that error twice.
After the upgrade I get a non-bootable 6.1.0-18 image.
Doing some fiddling, I got a bootable 6.1.0-18 image but no GUI.

I removed linux-image and linux-headers 6.1.0.-18 an I now have 
6.1.0.-17 working.

Has anyone else encounter this issue?