Date: Mon, 22 Mar 2021 16:06:34 +0100 From: Rainer Duffner <rainer@ultra-secure.de> To: stable@freebsd.org Subject: Help with applying a differential Message-ID: <91FAFF6B-F0E5-4559-A2F1-AC17C93F9268@ultra-secure.de>
next in thread | raw e-mail | index | archive | help
Hi, I need help applying this differential https://reviews.freebsd.org/D24428 Me and a co-worker (who is one order of magnitude better at all things = git than me) are unable to get this to apply. rduffner@suse5:~/freebsd-src/sys/dev/smartpqi> git apply --check = ~/Downloads/D24428.diff=20 error: patch failed: sys/dev/smartpqi/smartpqi_cam.c:231 error: sys/dev/smartpqi/smartpqi_cam.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_cmd.c:43 error: sys/dev/smartpqi/smartpqi_cmd.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_defines.h:77 error: sys/dev/smartpqi/smartpqi_defines.h: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_discovery.c:62 error: sys/dev/smartpqi/smartpqi_discovery.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_event.c:35 error: sys/dev/smartpqi/smartpqi_event.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_helper.c:43 error: sys/dev/smartpqi/smartpqi_helper.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_init.c:31 error: sys/dev/smartpqi/smartpqi_init.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_intr.c:32 error: sys/dev/smartpqi/smartpqi_intr.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_ioctl.h:67 error: sys/dev/smartpqi/smartpqi_ioctl.h: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_ioctl.c:53 error: sys/dev/smartpqi/smartpqi_ioctl.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_main.c:134 error: sys/dev/smartpqi/smartpqi_main.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_misc.c:39 error: sys/dev/smartpqi/smartpqi_misc.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_prototypes.h:120 error: sys/dev/smartpqi/smartpqi_prototypes.h: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_queue.c:32 error: sys/dev/smartpqi/smartpqi_queue.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_request.c:47 error: sys/dev/smartpqi/smartpqi_request.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_response.c:85 error: sys/dev/smartpqi/smartpqi_response.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_sis.c:77 error: sys/dev/smartpqi/smartpqi_sis.c: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_structures.h:29 error: sys/dev/smartpqi/smartpqi_structures.h: patch does not apply error: patch failed: sys/dev/smartpqi/smartpqi_tag.c:73 error: sys/dev/smartpqi/smartpqi_tag.c: patch does not apply I=E2=80=99m sure I=E2=80=99m missing something here. I tried this on FreeBSD with git from pkg (2.30.1) and the git from = OpenSuSE 15.2 (2.26.2) Rainer=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?91FAFF6B-F0E5-4559-A2F1-AC17C93F9268>