From owner-freebsd-stable@freebsd.org Mon Mar 22 19:03:35 2021 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 63B255B8B6A for ; Mon, 22 Mar 2021 19:03:35 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4F43n30Swtz4dF4 for ; Mon, 22 Mar 2021 19:03:35 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: by mailman.nyi.freebsd.org (Postfix) id 0FFE35B8CCD; Mon, 22 Mar 2021 19:03:35 +0000 (UTC) Delivered-To: stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0FC105B8AE7 for ; Mon, 22 Mar 2021 19:03:35 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: from connect.ultra-secure.de (connect.ultra-secure.de [88.198.71.201]) by mx1.freebsd.org (Postfix) with ESMTP id 4F43n25b5Pz4d5y for ; Mon, 22 Mar 2021 19:03:33 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: (Haraka outbound); Mon, 22 Mar 2021 20:03:39 +0100 Received-SPF: SoftFail (connect.ultra-secure.de: domain of ultra-secure.de does not designate 217.71.83.52 as permitted sender) receiver=connect.ultra-secure.de; identity=mailfrom; client-ip=217.71.83.52; helo=[192.168.1.238]; envelope-from= Received: from [192.168.1.238] (217-071-083-052.ip-tech.ch [217.71.83.52]) by connect.ultra-secure.de (Haraka/2.6.2-toaster) with ESMTPSA id 439506B8-D232-4677-AB55-007638A19500.1 envelope-from (authenticated bits=0); Mon, 22 Mar 2021 20:03:34 +0100 From: Rainer Duffner Message-Id: Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.17\)) Subject: Re: Help with applying a differential Date: Mon, 22 Mar 2021 20:03:27 +0100 In-Reply-To: Cc: Juraj Lutter , FreeBSD Stable ML To: Warner Losh References: <91FAFF6B-F0E5-4559-A2F1-AC17C93F9268@ultra-secure.de> <379F88B8-3823-43E2-9CC8-15980D0BC968@lutter.sk> X-Mailer: Apple Mail (2.3445.104.17) X-Haraka-GeoIP: EU, CH, 451km X-Haraka-ASN: 24951 X-Haraka-GeoIP-Received: X-Haraka-ASN: 24951 217.71.80.0/20 X-Haraka-ASN-CYMRU: asn=24951 net=217.71.80.0/20 country=CH assignor=ripencc date=2003-08-07 X-Haraka-FCrDNS: 217-071-083-052.ip-tech.ch X-Haraka-p0f: os="Mac OS X " link_type="DSL" distance=16 total_conn=16 shared_ip=N X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on spamassassin X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=ALL_TRUSTED,BAYES_00, HTML_MESSAGE,SPF_SOFTFAIL,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.1 X-Haraka-Karma: score: 6, good: 16712, bad: 601, connections: 18970, history: 16111, asn_score: 704, asn_connections: 807, asn_good: 730, asn_bad: 26, pass:asn, relaying X-Rspamd-Queue-Id: 4F43n25b5Pz4d5y X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2021 19:03:35 -0000 > Am 22.03.2021 um 17:59 schrieb Warner Losh : >=20 >=20 >=20 > On Mon, Mar 22, 2021, 10:19 AM Rainer Duffner > wrote: >=20 >=20 > > Am 22.03.2021 um 16:34 schrieb Juraj Lutter >: > >=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 = -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