From nobody Wed May 22 18:49:57 2024 X-Original-To: freebsd-arm@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vl0j531xZz5KThS for ; Wed, 22 May 2024 18:49:45 +0000 (UTC) (envelope-from fbsd@www.zefox.net) Received: from www.zefox.net (www.zefox.net [50.1.20.27]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "generic", Issuer "generic" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vl0j44MhCz4sfl for ; Wed, 22 May 2024 18:49:44 +0000 (UTC) (envelope-from fbsd@www.zefox.net) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of fbsd@www.zefox.net has no SPF policy when checking 50.1.20.27) smtp.mailfrom=fbsd@www.zefox.net Received: from www.zefox.net (localhost [127.0.0.1]) by www.zefox.net (8.17.1/8.17.1) with ESMTPS id 44MInvYO034085 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 22 May 2024 11:49:58 -0700 (PDT) (envelope-from fbsd@www.zefox.net) Received: (from fbsd@localhost) by www.zefox.net (8.17.1/8.17.1/Submit) id 44MInvho034084; Wed, 22 May 2024 11:49:57 -0700 (PDT) (envelope-from fbsd) Date: Wed, 22 May 2024 11:49:57 -0700 From: bob prohaska To: freebsd-arm@freebsd.org Cc: bob prohaska Subject: error: merge died of signal 1115) Message-ID: List-Id: Porting FreeBSD to ARM processors List-Archive: https://lists.freebsd.org/archives/freebsd-arm List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-arm@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spamd-Bar: - X-Spamd-Result: default: False [-1.10 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; WWW_DOT_DOMAIN(0.50)[]; MID_RHS_WWW(0.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:7065, ipnet:50.1.16.0/20, country:US]; RCVD_TLS_LAST(0.00)[]; MISSING_XM_UA(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-arm@freebsd.org]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DMARC_NA(0.00)[zefox.net]; TO_MATCH_ENVRCPT_SOME(0.00)[]; R_SPF_NA(0.00)[no SPF record] X-Rspamd-Queue-Id: 4Vl0j44MhCz4sfl [aside, the trailing ) in the subject isn't a typo] A Pi2 v1.1 running FreeBSD www.zefox.com 14.0-RELEASE-p6 FreeBSD 14.0-RELEASE-p6 #51 +releng/14.0-n265417-d338712beb16: Sat Apr 6 23:48:20 PDT 2024 +bob@www.zefox.com:/usr/obj/usr/src/arm.armv7/sys/GENERIC arm reported error: merge died of signal 1115) while running git pull. Any ideas what it means? Re-running git pull elicted: error: Unable to create '/usr/src/.git/index.lock': File exists. Deleting the errant lock file has resulted in error: Your local changes to the following files would be overwritten by merge: ....[long list of files] Perhaps more important, how does one recover? So far attempts at git reset didn't help. There are no local changes to preserve, but re-cloning is a slow and sometimes difficult process. Thanks for reading, and any guidance! bob prohaska