From nobody Tue Apr 7 12:52:10 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A844412CDA5 for ; Fri, 13 Mar 2026 01:42:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773366181; cv=none; b=CYuA7qbIJuYkgkXaH6OQdWGGEz8hdR6p4Tdhr3FGN/4btiOcLu0hnLVJ6j+LL3qtPFp0KblVs+lK7O8LxAz5ytGeTCNO4rpGzt5vJkp1f54qjoLW6jrH8xbbH3N2mxG/yJkmgjer7uODfCyRmOKMIr0RW/XeTbGHcyQ0byV/1Lg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773366181; c=relaxed/simple; bh=LC4MJ3VseePMtCMRK7XabT/YzQPqHL2ZbdZNgt8NnIo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mzSAKB+VW8uGVFwPOZqO2XQmN217HWcSqHzTnl8laPArDwRiOZx1y6ge/WPYSZnCWZ9hKerYgVKDDAEYpq44yWBHuZuYQpABg+sHp01fWuWWpJLEhAgmg263hH1CpoW97/R9JYtWzzK5dbdurFMLQaCvna5SXZ4rJzTAtuP6PmM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PGJsEseg; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PGJsEseg" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-48534b59cf3so14746205e9.2 for ; Thu, 12 Mar 2026 18:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773366178; x=1773970978; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AX8JqLrpHXi9BB2eCMU4bPZXmkLwZ4cYnTfuezKpUOQ=; b=PGJsEsegDov1R5Mv+oDeaLneCDy3g8znGf7pszUwzu13g8YjTAWpqWNG2XdIc5OcDK ZmAkv1BKZq+zjWCWmu4d8+qFUKMNqkEXoEfUqqp+1DSIJw4ShcHJO8XOHgeocKqB8wKR lTh69cQ9EstN+phjWo325WiQKQ1mttYN10mDOy5cQ7wTtoWNbAZ+Zgmr0KoRMfr6wIPB WD6ztqPi1as6gkzlLqqRdX8wouqC0yOCB/rBhEL/Gtj7cTgTHZwSKc5CldoFbNt1gkBs j5W+aKpq3xnPrJKYy09x5E5ujRCUXxslp5DECUbVtXu//m5ebuS6D32OWBF9s6ppkH9H UX6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773366178; x=1773970978; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=AX8JqLrpHXi9BB2eCMU4bPZXmkLwZ4cYnTfuezKpUOQ=; b=fg3kMjJt9fY0B1yrGp8AJqAp/FEggzTPkbFYcDZov1nCLOhNekRWlAYr4SMpSz5wlj d9fgxZ6VLcteDQSee0ACgPKX/hYuWDX+8Y184Jj5UoCn5lsG45oF/BZs36ouvZW92cI1 GVOn5kVPv+7ajB/mjGgWIQ5WCv93MZ7r4BuapNR6CYGjam7ZyAv41kqGb/4uD5sGtOWY m52Y0XfHHwzBPKyITGayLK7V0IWWiQiNrRMzAqzENl9vxm96ndIaa+s05wtnv9oxXhew o4CH7tH72wLUC1ewx0pxoQsQfj0dBDI8z5a51Od3YYNl0fRUyLJ4CgB+hzLR5Bg3IFdB ZFbQ== X-Gm-Message-State: AOJu0YzENR4SJ9R85zcqPv3UYrf/ENtLnEtiwmWeFf/9Mn//qGGieMZY cEn/aUKHpQufFnMY5UxlWlNMEN4QLNd7x7SWSpHjxy51lN6E0eaRE42a X-Gm-Gg: ATEYQzxwsUfFrqhuXj9c7Wk4swYA4eWoa5QlhxtmsEMfaZNusEXZ/pjmV0D+YHgpsqH WFCXlUHU0OOBUAdE8Uxp+YzPz6yYv2X2h0MLB7JR6c57EuvLpvQN7pMknI3yW5QU+RmYIOc+EUn KA0q8hMN0xQ6iNedDMuKOOypFV2KNHsps/Uk0a4dLhwDkKP8WMDKU02VPjdo06d9SLQbTmmXujk 2ZBeDa/Y5iHYZXwjBTAXWN28k/aT4e1prnvE1OhuA1zccvfkG2gk/CqOiJ1iGx6JclclFga+F/8 SCo3o4Zt5xb+DvYzOHaDhMtOlj/8K1RXg54cSV1pyk2OrIvgVNcPpcK/0IHPhDoqZYq5/msVOcI PMzrntNu4NEFeTNRaLC5gbSqC+17nIrnx50h1NJ/oUUPow/YGXJcakXq95lkOawWVb5l7Hued+R v4E644gnaLoaQgeBK8klvSFkI+Ilq+/mypnhNqSiTFrZiPX3OfjKkv X-Received: by 2002:a05:600c:4f8f:b0:485:3423:727d with SMTP id 5b1f17b1804b1-4855670c095mr22531865e9.26.1773366177779; Thu, 12 Mar 2026 18:42:57 -0700 (PDT) Received: from teknoraver-mbp.local.lan ([217.201.41.195]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b5e912fsm453841155e9.2.2026.03.12.18.42.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 12 Mar 2026 18:42:57 -0700 (PDT) From: Matteo Croce To: Andy Whitcroft , Joe Perches Cc: linux-kernel@vger.kernel.org, Matteo Croce Subject: [PATCH] checkpatch: error on .orig and .rej files in patches Date: Fri, 13 Mar 2026 02:42:53 +0100 Message-ID: <20260313014253.11225-1-technoboy85@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Matteo Croce Since commit 76be4f5a7845 ("Remove *.orig pattern from .gitignore"), it's easier to accidentally slip a .orig file into a patch. Add a RESIDUAL_FILE error when a patch modifies .orig or .rej files, which are typically leftovers from a failed patch application. Skip all further checks on the content of such files to avoid spurious warnings. Signed-off-by: Matteo Croce --- scripts/checkpatch.pl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index c0250244cf7a..d110afef1b57 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2701,6 +2701,7 @@ sub process { my $comment_edge =3D 0; my $first_line =3D 0; my $p1_prefix =3D ''; + my $skip_residual_file =3D 0; =20 my $prev_values =3D 'E'; =20 @@ -2881,6 +2882,7 @@ sub process { $realfile =3D $1; $realfile =3D~ s@^([^/]*)/@@ if (!$file); $in_commit_log =3D 0; + $skip_residual_file =3D 0; $found_file =3D 1; } elsif ($line =3D~ /^\+\+\+\s+(\S+)/) { $realfile =3D $1; @@ -2913,6 +2915,15 @@ sub process { } =20 if ($found_file) { + if ($realfile =3D~ /\.(orig|rej)$/) { + if (!$skip_residual_file) { + ERROR("RESIDUAL_FILE", + "patch modifies a .$1 file: '$realfile', likely leftover from a= failed patch application\n"); + } + $skip_residual_file =3D 1; + next; + } + $skip_residual_file =3D 0; if (is_maintained_obsolete($realfile)) { WARN("OBSOLETE", "$realfile is marked as 'obsolete' in the MAINTAINERS hierarchy. = No unnecessary modifications please.\n"); @@ -2939,6 +2950,8 @@ sub process { next; } =20 + next if ($skip_residual_file); + $here .=3D "FILE: $realfile:$realline:" if ($realcnt !=3D 0); =20 my $hereline =3D "$here\n$rawline\n"; --=20 2.50.1