From 3cb6231581679a9ab1a8eeb0342375eb7002cebe Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin (Intel)" Date: Fri, 10 Apr 2026 13:21:41 -0700 Subject: [PATCH] asm/preproc.c: remove git merge crap in comment A comment accidentally was left with a merge resolution annotation. This was of course harmless, being in a comment, but it shouldn't be there. Signed-off-by: H. Peter Anvin (Intel) --- asm/preproc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/asm/preproc.c b/asm/preproc.c index 85606e05f..56dbc48e8 100644 --- a/asm/preproc.c +++ b/asm/preproc.c @@ -156,14 +156,10 @@ static bool is_smac_param(enum token_type toktype) * We prohibit tokens of length > MAX_TEXT even though length here is * an unsigned int; this avoids problems if the length is passed * through an interface with type "int", and is absurdly large anyway. -<<<<<<< Updated upstream + * * Use INT_MAX >> 2 to try to at least try to avoid risking wraparound * even in the fairly extreme case when "int" is incorrectly used and * two lengths are added. That is still 512GB with a 32-bit int... -======= - * Use INT_MAX >> 1 to try to at least try to avoid risking wraparound - * even when "int" is incorrectly used. ->>>>>>> Stashed changes * * Earlier versions of the source code incorrectly stated that * examining the text string alone can be unconditionally valid. This