From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id BG6GDRf1M2p+hA0AWB0awg (envelope-from ) for ; Thu, 18 Jun 2026 09:39:35 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LBIro7RS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=47ZT7P+K; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LBIro7RS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=47ZT7P+K; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 1F1651E024; Thu, 18 Jun 2026 09:39:35 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 6F4411E024 for ; Thu, 18 Jun 2026 09:39:34 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 324544BA9011 for ; Thu, 18 Jun 2026 13:39:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 324544BA9011 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LBIro7RS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=47ZT7P+K; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LBIro7RS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=47ZT7P+K Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id B35A44BA2E08 for ; Thu, 18 Jun 2026 13:38:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B35A44BA2E08 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B35A44BA2E08 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1781789900; cv=none; b=bHfScBTWnlOCtagM1ARXyCsKV2gFBwyzJxXyZ01E503UyD1W819lM4jCYhFvX+d6qsXRS4vXmfL5U4s20+S/cXmWJ6wH07CZmK1/zotZeweb/tuKMTgcWjaGTDGfHOKnbidpNWAsP0SIdrgpmcKZ8oirjSVVmIa8J6bVnmiFUQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1781789900; c=relaxed/simple; bh=xNuXksIlA3NMJCkBEEJsfQGux4APxh/ylCjVsYuUAC4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=JziG5HPOVp/sXR3jVBFsKomjO458zdTmnMaDTPP6vVRBMoPtXda1BaDJE+zjXFZi6I5QKpDovBvbL5ECKe1Gp5t06JpYlXZ5YG9TiM6hsL32wOf26MYsLqKMXY3f7DRNsahve+6eHzpD6OEkAElMifjR5KPH1kczFjfpdDdE9eU= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LBIro7RS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=47ZT7P+K; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LBIro7RS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=47ZT7P+K DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B35A44BA2E08 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id BA5566D2FD for ; Thu, 18 Jun 2026 13:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1781789899; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D2GjjI13wAao83S+fU4w/6F7Fy1UHRG0hBHRZ8DDSlE=; b=LBIro7RSwQaSXbDoYLMkL6E9lsilsV4GcHW7uAbwAKIxU8G26K9RW6a6JqVhBNBp+oNKaM 6turrFhOz1KDuWEwnReHsTvVknkQFeFmm7/Hy9pep1fWyti75WmebjFyuPXbNO+7aWzntl 7fWG5PJE9kPk1WPAcJjQ7DYVHgGTMfs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1781789899; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D2GjjI13wAao83S+fU4w/6F7Fy1UHRG0hBHRZ8DDSlE=; b=47ZT7P+Kbh/VF5+yfWGJ2ouHW0YIvlcKzvcGr/LPeUokFaxWMiP2FDQiECJSAzjCraM47Z B/iq4q6GqQozNcCA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LBIro7RS; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=47ZT7P+K DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1781789899; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D2GjjI13wAao83S+fU4w/6F7Fy1UHRG0hBHRZ8DDSlE=; b=LBIro7RSwQaSXbDoYLMkL6E9lsilsV4GcHW7uAbwAKIxU8G26K9RW6a6JqVhBNBp+oNKaM 6turrFhOz1KDuWEwnReHsTvVknkQFeFmm7/Hy9pep1fWyti75WmebjFyuPXbNO+7aWzntl 7fWG5PJE9kPk1WPAcJjQ7DYVHgGTMfs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1781789899; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D2GjjI13wAao83S+fU4w/6F7Fy1UHRG0hBHRZ8DDSlE=; b=47ZT7P+Kbh/VF5+yfWGJ2ouHW0YIvlcKzvcGr/LPeUokFaxWMiP2FDQiECJSAzjCraM47Z B/iq4q6GqQozNcCA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9F28B779AC for ; Thu, 18 Jun 2026 13:38:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OPNoJcv0M2oSaAAAD6G6ig (envelope-from ) for ; Thu, 18 Jun 2026 13:38:19 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/9] [gdb] Fix leftover conflict marker in gdb/config/djgpp/README Date: Thu, 18 Jun 2026 15:38:11 +0200 Message-ID: <20260618133818.55460-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260618133818.55460-1-tdevries@suse.de> References: <20260618133818.55460-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid, suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: BA5566D2FD X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org For gdb/config/djgpp/README, we have: ... gdb/config/djgpp/README:6: leftover conflict marker ... This is a false positive, this is just some text formatting using '=': ... General ======= ... whose length happens to match the default value of git attribute conflict-marker-size: 7. Fix this by setting the conflict-marker-size to 80. --- gdb/config/djgpp/.gitattributes | 3 +++ gdb/contrib/check-whitespace-pre-commit.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 gdb/config/djgpp/.gitattributes diff --git a/gdb/config/djgpp/.gitattributes b/gdb/config/djgpp/.gitattributes new file mode 100644 index 00000000000..807fd6d5c56 --- /dev/null +++ b/gdb/config/djgpp/.gitattributes @@ -0,0 +1,3 @@ +# -*- conf -*- + +README conflict-marker-size=80 diff --git a/gdb/contrib/check-whitespace-pre-commit.py b/gdb/contrib/check-whitespace-pre-commit.py index fb4e4b8f537..fbcc1a1ac45 100755 --- a/gdb/contrib/check-whitespace-pre-commit.py +++ b/gdb/contrib/check-whitespace-pre-commit.py @@ -36,7 +36,6 @@ todo_list = [ "gdb/features/sparc/sparc32-fpu.xml", "gdb/features/s390-core64.xml", "gdb/features/sparc/sparc32-cp0.xml", - "gdb/config/djgpp/README", "gdb/exc_request.defs", "gdb/doc/refcard.tex", "gdb/doc/stack_frame.txt", -- 2.51.0