From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id r3gDF3OmVmJwfwAAgWs5BA (envelope-from ) for ; Wed, 13 Apr 2022 12:31:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cLT0DnOmVmLUAgAAG6o9tA (envelope-from ) for ; Wed, 13 Apr 2022 12:31:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id ED4AA3CF68 for ; Wed, 13 Apr 2022 12:31:14 +0200 (CEST) Received: from localhost ([::1]:46346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neaHK-0006DS-2H for larch@yhetil.org; Wed, 13 Apr 2022 06:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neaGC-0006CK-5X for guix-patches@gnu.org; Wed, 13 Apr 2022 06:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neaGB-0007H6-4c for guix-patches@gnu.org; Wed, 13 Apr 2022 06:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1neaGA-0007VT-RA for guix-patches@gnu.org; Wed, 13 Apr 2022 06:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54829] [PATCH 0/2] Update Emacs to 28.1 and add socket activation Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Apr 2022 10:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: Maxime Devos , 54829@debbugs.gnu.org Received: via spool by 54829-submit@debbugs.gnu.org id=B54829.164984579528814 (code B ref 54829); Wed, 13 Apr 2022 10:30:02 +0000 Received: (at 54829) by debbugs.gnu.org; 13 Apr 2022 10:29:55 +0000 Received: from localhost ([127.0.0.1]:51750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neaG2-0007Ug-R5 for submit@debbugs.gnu.org; Wed, 13 Apr 2022 06:29:55 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:38754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neaG0-0007UT-Ng for 54829@debbugs.gnu.org; Wed, 13 Apr 2022 06:29:53 -0400 Received: by mail-wr1-f41.google.com with SMTP id p18so1124624wru.5 for <54829@debbugs.gnu.org>; Wed, 13 Apr 2022 03:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=A4cA/7w9FMDPs4KamZ82S6owtZyaidIP37OzAPHTK14=; b=TSHt14+mWBbDR18IXoniFlzmWPXbP0JcfzSTjm+R3T6tjcBAprCp8QoDO6UhUvrCnd DDz5Gxtu3xq5bCaDrLt0u0588aIwdTqjr1kGQbAkenslXEM3D2Yno7JUSgjxuDwNotUB hD8F/Lk3VXb8MXgOSQ9GtgFozmJtzO8hIU3hi611eok++9EjBO+cfb+FkpsnizYG2VLr 4kvx+e3D3U/LkXQ2q3gTizad9GL/7KJSL347SIp8NblpSvCumuD6xkLIQtXPNHRkLYZh N10sVLoZLKyZUoOK3ybmWYDWgiHeilaaQc1yVWsX+uhNjoE2m4h1O9LpqqG/LXGndLRd GdsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=A4cA/7w9FMDPs4KamZ82S6owtZyaidIP37OzAPHTK14=; b=0t4RmxFBxeNq14ntZt+46iztlFQjdVH8JCsXPhnjHK6fBOtlBcKwuGa1reMyBaiTYc QKtsW2ItP3xav+laZ427oB7uKNBr5SHeyvWySpTDo0Ow75BKhrZ2T9NHpfUFEUqiVIpy NcYa9yQ90b1kDTJ5u3x9hUMmKZSKGTxGYZ3AV+Z8Sb7uPOOqvHdthMAnJ5vfHIeJzQU0 wElv616gpcnQ0xJhSeVz2JfGPXuRtx8lhlcwhnM1jNMcKsr/WrsctpRx2IAwbt7fCX0W fM79wM4/Jh+V9lJp6G80gweoOIRMzEgR8O7DkgURAu+a2Rb0zDE4ti/n+nXJKI+xXh9Z 4g2g== X-Gm-Message-State: AOAM533SDRgtEJSf9MP/J9O+4PIQWaZLa1OQIkYgknunnOpop2fjBsP2 tFGgOSpuD/dzrDlu+/YJ7hUNt3hGBj4= X-Google-Smtp-Source: ABdhPJzvxgkQCaEmKBH0S2qxzk/ejB+LnWLQR58IQIlYBt8uJlcRAmnok7g45fxKbWKb6J5u/gvUhg== X-Received: by 2002:adf:fdcd:0:b0:207:a471:3ca4 with SMTP id i13-20020adffdcd000000b00207a4713ca4mr12812062wrs.415.1649845786678; Wed, 13 Apr 2022 03:29:46 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id w4-20020a7bc104000000b0038eba17a797sm1927551wmi.31.2022.04.13.03.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 03:29:46 -0700 (PDT) From: zimoun In-Reply-To: References: <87sfqi67ky.fsf_-_@gmail.com> Date: Wed, 13 Apr 2022 12:29:28 +0200 Message-ID: <86y2091dkn.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1649845875; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=A4cA/7w9FMDPs4KamZ82S6owtZyaidIP37OzAPHTK14=; b=Bicv/KLJ1NNL2HA0F9tiaGLThymPIAWPZUnbTHd3BtArcnYlmEKjFhaBFnCSSFspysQG8n oZKbMxivW4txJ7612x1Y2HRwnyED5vgK2Mt3KdnZawuoZ4Y55Nfh7zcxv0i2J3B9vqvWe7 0xRTFfaYu/g3dg4Xg9yH10VEFZYrTksuGF3lo/mfttId+VpBxmfL7QLh0KMVWRcQo7Obrv 4H9UJRua95AwEa5cXTzshWPYGNcu4m5s5EunA03ruvXrmR4KSLlNBYhXFQHy7eJcq/cjyH 1s9eXsoh5DLTjnnX5i8ADHfTZFMho1nb+X0ByHzbmZkXwGHNXqJ3RX6mCEdGGA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649845875; a=rsa-sha256; cv=none; b=nhpWFivudAbe1i0AAVPf/UVIE6nBSdbTYOfM/MkINU3cr4oGDd5KrwV8JBHH/K8uJTVNMz H6t2nP1Pm+4jy4NuROHvOIo0VkP783dh+OkCf5FYLXydsqLm3czRS0RvvpGck3SZ84qzuF p7sfmrKjy8gBBGznDUgYV+VC3keIqKqjUyHpZ0BJfZY9TW+sEzXlx28oHghb5rZFfdIIaw xTFcVj+dN2ixBDI0dD9J2z6QYH5VhnX5FK5pPZyuvcrp4FSVVK8ReRW7zFxcn/0lGz7k6k ndJfnmWTyC2WKlDsqcQdW6SMRbyGW+LCMPgtuoqB/OtUeUXUxH5NyCRnh4b/Xw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=TSHt14+m; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.44 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=TSHt14+m; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: ED4AA3CF68 X-Spam-Score: 7.44 X-Migadu-Scanner: scn1.migadu.com X-TUID: j1TEOySPjszS Hi Liliana, On Tue, 12 Apr 2022 at 20:19, Liliana Marie Prikler wrote: > Am Dienstag, dem 12.04.2022 um 10:15 +0200 schrieb zimoun: >> Applying patch v2 1/3, I get: >>=20 >> --8<---------------cut here---------------start------------->8--- >> error: corrupt patch at line 71 >> hint: Use 'git am --show-current-patch=3Ddiff' to see the failed patch >> Applying: gnu: emacs: Update to 28.1. >> Patch failed at 0001 gnu: emacs: Update to 28.1. >> When you have resolved this problem, run "git am --continue". >> If you prefer to skip this patch, run "git am --skip" instead. >> To restore the original branch and stop patching, run "git am -- >> abort". >> --8<---------------cut here---------------end--------------->8--- >>=20 >> I do not know what is wrong.=C2=A0 Could you provide the commit against >> which this patch applies?=C2=A0 See 'git format-patch --base=3D'. > > I have some unfinished work below this, so it's not clean, but I'm > doing somewhat regular rebases on master. The last commit is > 47b6451eb55d74161d6e5899f0079e219cfa8a00. For some reasons I totally miss, the patch v2 1/3 does not apply for me with the same message as above, even against 47b6451eb55d74161d6e5899f0. Anyway, I can wait for v3. :-) Cheers, simon