From owner-freebsd-stable@freebsd.org Mon Mar 22 16:59:27 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 43CC85B525C for ; Mon, 22 Mar 2021 16:59:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) 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 4F411p6vhRz4SFR for ; Mon, 22 Mar 2021 16:59:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id EB3D75B52D9; Mon, 22 Mar 2021 16:59:26 +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 EB01F5B51DA for ; Mon, 22 Mar 2021 16:59:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F411p693kz4SCJ for ; Mon, 22 Mar 2021 16:59:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x830.google.com with SMTP id h7so12843575qtx.3 for ; Mon, 22 Mar 2021 09:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Q5yFaEps6pnEI9ck4scY+cOr7i5GTmUse0oLyUyfGy8=; b=uePvK/AVqf+f5hwHD7pjVBJOj2VkGX/jDtPG558cKNF5KhKCWTxMdBYO/8W3bFLtWq PQYR0wo7c6TYLFxb/vSgR4+uPFcF5IWUWOfmFcFDx0T+97vxOKadUmNOxuLu0g0IOkjg iSh39YvMWcUMs+FBaC1+GoUUxLezqGpnBy7amcxGe2H+U5+rjI3f4vw7foaJxw+jPJEW ko1Y9QaeGJleTSyWJ+uV5xkdtfFJXzwqPVCvv4VScNYpt6RkGzowCanj8iRGrXCW1Q5+ FGfJ+HFJCTgsSKIsIqKtU01aVEXkzX2nWnK/a+ZDD0uXUsgJlCOIKHE7M/7hEnlBOlqG wcgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Q5yFaEps6pnEI9ck4scY+cOr7i5GTmUse0oLyUyfGy8=; b=HZnhdWYEQyau9cYH4wZFkJM/Da89DBw30klSym/T5jEvPdeaFNuTBcMekmHLMoEj8z aXzFBgGUuvgYPBgyG7q97vLn1yg8obTTIbOZ6JNwDJ2rRAHzE8A+h3gZxVqbG2q5e2QU c6xGIMDh0f0iu0bIh0/XFqRuxzTBcQw2dyphbLjvVIX0x90335XRyXsDXm/rbgwdw2i1 fC0J1otCIWzFYolhmwmf9M2CpnqHg2S+0ejxE27Zc08bfGBbdmx/RN9P47m7vqlDznzA 7CyU/hEdWgBZLX55VrNjPPFxy/zz98+Jc9804nt9QvPf9wwhSqE1+8oSiWMeJ4o/G+qa DuEg== X-Gm-Message-State: AOAM530heg4EXNYSmI11rfXmDP2v43rVHmsRMoQ3+Ox3+gI7q5x263mC w+dhTy33ZIICZnOn+Tg6FD3aqEtoduL2rr2+NzKSG5843SiuSrGA X-Google-Smtp-Source: ABdhPJzGy8aLDdA/Oefw07xSHL+Rp4+V4AFUuP5LShe4w/fPnre/R9Ji2SluSu11K90gYKMSI8nX/pr9j7jo3dcUEZw= X-Received: by 2002:a05:622a:1c5:: with SMTP id t5mr762957qtw.49.1616432365567; Mon, 22 Mar 2021 09:59:25 -0700 (PDT) MIME-Version: 1.0 References: <91FAFF6B-F0E5-4559-A2F1-AC17C93F9268@ultra-secure.de> <379F88B8-3823-43E2-9CC8-15980D0BC968@lutter.sk> In-Reply-To: From: Warner Losh Date: Mon, 22 Mar 2021 10:59:14 -0600 Message-ID: Subject: Re: Help with applying a differential To: Rainer Duffner Cc: Juraj Lutter , FreeBSD Stable ML X-Rspamd-Queue-Id: 4F411p693kz4SCJ 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 16:59:27 -0000 On Mon, Mar 22, 2021, 10:19 AM Rainer Duffner wrote: > > > > Am 22.03.2021 um 16:34 schrieb Juraj Lutter : > > > > > > To which branch do you want to apply those patches? > > > > Judging from the original patch date, I=E2=80=99d say that they have be= en > 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=E2=80=99t 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=E2=80=A6 > For me, It almost applied cleanly to stable/12 branch, but not to the main branch: % 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 In the main branch, it crashed patch :(. 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. 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. Warner