Date: Mon, 22 Mar 2021 20:03:27 +0100 From: Rainer Duffner <rainer@ultra-secure.de> To: Warner Losh <imp@bsdimp.com> Cc: Juraj Lutter <juraj@lutter.sk>, FreeBSD Stable ML <stable@freebsd.org> Subject: Re: Help with applying a differential Message-ID: <EB254A13-C274-44D8-B564-FF4DC70893CF@ultra-secure.de> In-Reply-To: <CANCZdfoNha2SZya-CtxE2XN9YZ-XYuboV_5m0TN=E6pDGc1jLA@mail.gmail.com> References: <91FAFF6B-F0E5-4559-A2F1-AC17C93F9268@ultra-secure.de> <379F88B8-3823-43E2-9CC8-15980D0BC968@lutter.sk> <A44D0B89-E2F8-4FD6-9356-9B68E6FD95F0@ultra-secure.de> <CANCZdfoNha2SZya-CtxE2XN9YZ-XYuboV_5m0TN=E6pDGc1jLA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> Am 22.03.2021 um 17:59 schrieb Warner Losh <imp@bsdimp.com>: >=20 >=20 >=20 > On Mon, Mar 22, 2021, 10:19 AM Rainer Duffner <rainer@ultra-secure.de = <mailto:rainer@ultra-secure.de>> wrote: >=20 >=20 > > Am 22.03.2021 um 16:34 schrieb Juraj Lutter <juraj@lutter.sk = <mailto:juraj@lutter.sk>>: > >=20 > >=20 > > To which branch do you want to apply those patches? > >=20 > > Judging from the original patch date, I=E2=80=99d 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. > >=20 > > otis >=20 >=20 > Well, I tried this: >=20 > git clone -o freebsd https://github.com/freebsd/freebsd-src.git = <https://github.com/freebsd/freebsd-src.git>; -b releng/13.0 src > cd src/sys/dev/smartpqi/ > git apply --check ~/Downloads/D24428.diff=20 >=20 > but it doesn=E2=80=99t really make a difference. >=20 > rduffner@suse5:~/f2/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 >=20 > where-as for the 12.2-src I get less problems actually: >=20 > rduffner@suse5:~/f2/src-12/sys/dev/smartpqi> git apply --check = ~/Downloads/D24428.diff=20 > 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 >=20 >=20 > I really wonder against what source I need to apply that patch=E2=80=A6 >=20 > For me, It almost applied cleanly to stable/12 branch, but not to the = main branch: >=20 > % find . -name \*.rej > ./sys/dev/smartpqi/smartpqi_mem.c.rej > ./sys/dev/smartpqi/smartpqi_queue.c.rej > ./sys/dev/smartpqi/smartpqi_defines.h.rej > ./sys/dev/smartpqi/smartpqi_cam.c.rej > ./sys/dev/smartpqi/smartpqi_misc.c.rej > ./sys/dev/smartpqi/smartpqi_main.c.rej > ./sys/dev/smartpqi/smartpqi_request.c.rej >=20 > In the main branch, it crashed patch :(. >=20 > A quick sample of the .rej files shows the diffs likely are easy to = resolve by hand, but with such a large patch I'm leery to do so. Add = '-l' to patch to cope with whitespace changes didn't seem to help. >=20 > So it looks like this patch needs to be regenerated and/or moved to = git where patch generation and uploading is a bit more reliable. >=20 > Warner OK, I could do it manually then=E2=80=A6 Maybe I have time tomorrow. It=E2=80=99s a really bad situation with that driver, BTW. I have constant crashes every couple of days. Rainer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EB254A13-C274-44D8-B564-FF4DC70893CF>