> Am 22.03.2021 um 16:34 schrieb Juraj Lutter <ju...@lutter.sk>:
> 
> 
> To which branch do you want to apply those patches?
> 
> Judging from the original patch date, I’d say that they have been developed 
> against 13.0 at some point.
> That being said, you may want to try to apply them manually against 13.0 
> sources and see if/how they fail.
> 
> otis


Well, I tried this:

git clone -o freebsd https://github.com/freebsd/freebsd-src.git -b releng/13.0 
src
cd src/sys/dev/smartpqi/
git apply --check  ~/Downloads/D24428.diff 

but it doesn’t really make a difference.

rduffner@suse5:~/f2/src/sys/dev/smartpqi> git apply --check  
~/Downloads/D24428.diff 
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

where-as for the 12.2-src I get less problems actually:

rduffner@suse5:~/f2/src-12/sys/dev/smartpqi> git apply --check  
~/Downloads/D24428.diff 
error: patch failed: sys/dev/smartpqi/smartpqi_cam.c:473
error: sys/dev/smartpqi/smartpqi_cam.c: patch does not apply
error: patch failed: sys/dev/smartpqi/smartpqi_defines.h:856
error: sys/dev/smartpqi/smartpqi_defines.h: patch does not apply
error: patch failed: sys/dev/smartpqi/smartpqi_main.c:312
error: sys/dev/smartpqi/smartpqi_main.c: patch does not apply
error: patch failed: sys/dev/smartpqi/smartpqi_mem.c:28
error: sys/dev/smartpqi/smartpqi_mem.c: patch does not apply
error: patch failed: sys/dev/smartpqi/smartpqi_misc.c:69
error: sys/dev/smartpqi/smartpqi_misc.c: patch does not apply
error: patch failed: sys/dev/smartpqi/smartpqi_queue.c:280
error: sys/dev/smartpqi/smartpqi_queue.c: patch does not apply
error: patch failed: sys/dev/smartpqi/smartpqi_request.c:540
error: sys/dev/smartpqi/smartpqi_request.c: patch does not apply


I really wonder against what source I need to apply that patch…



Rainer



_______________________________________________
freebsd-stable@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"

Reply via email to