From owner-freebsd-stable@freebsd.org Mon Mar 22 16:19:29 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 150D65B3BBC for ; Mon, 22 Mar 2021 16:19:29 +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 4F407h69Gmz3tg4 for ; Mon, 22 Mar 2021 16:19:28 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: by mailman.nyi.freebsd.org (Postfix) id D1DDB5B3BBB; Mon, 22 Mar 2021 16:19:28 +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 D19F95B3D35 for ; Mon, 22 Mar 2021 16:19:28 +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 4F407h0wPVz3tg3 for ; Mon, 22 Mar 2021 16:19:27 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: (Haraka outbound); Mon, 22 Mar 2021 17:20:21 +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 719F4224-4263-49BB-99E8-A79F0AEF68F0.1 envelope-from (authenticated bits=0); Mon, 22 Mar 2021 17:20:16 +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 17:19:19 +0100 In-Reply-To: <379F88B8-3823-43E2-9CC8-15980D0BC968@lutter.sk> Cc: stable@freebsd.org To: Juraj Lutter 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=7 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: 16703, bad: 601, connections: 18961, history: 16102, asn_score: 695, asn_connections: 798, asn_good: 721, asn_bad: 26, pass:asn, relaying X-Rspamd-Queue-Id: 4F407h0wPVz3tg3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of rainer@ultra-secure.de designates 88.198.71.201 as permitted sender) smtp.mailfrom=rainer@ultra-secure.de X-Spamd-Result: default: False [-2.69 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[ultra-secure.de]; RBL_DBL_DONT_QUERY_IPS(0.00)[88.198.71.201:from]; SPAMHAUS_ZRD(0.00)[88.198.71.201:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.99)[-0.993]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:24940, ipnet:88.198.0.0/16, country:DE]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[stable] 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 16:19:29 -0000 > 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 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=20 but it doesn=E2=80=99t really make a difference. 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 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=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 I really wonder against what source I need to apply that patch=E2=80=A6 Rainer