[folded-merged] checkpatch-update-__attribute__sectionname-quote-removal-v2.patch removed from -mm tree

[folded-merged] checkpatch-update-__attribute__sectionname-quote-removal-v2.patch removed from -mm tree

[akpm]

The patch titled
     Subject: checkpatch-update-__attribute__sectionname-quote-removal-v2
has been removed from the -mm tree.  Its filename was
     checkpatch-update-__attribute__sectionname-quote-removal-v2.patch

This patch was dropped because it was folded into checkpatch-update-__attribute__sectionname-quote-removal.patch

------------------------------------------------------
From: Joe Perches <joe@perches.com>
Subject: checkpatch-update-__attribute__sectionname-quote-removal-v2

This is a slightly shorter/better patch as it eliminates the separate
test below the possible conversions loop.

Link: https://lkml.kernel.org/r/58e9d55e933dc8fdc6af489f2ad797fa8eb13e44.camel@perches.com
Cc: Dwaipayan Ray <dwaipayanray1@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 scripts/checkpatch.pl |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/scripts/checkpatch.pl~checkpatch-update-__attribute__sectionname-quote-removal-v2
+++ a/scripts/checkpatch.pl
@@ -6241,14 +6241,11 @@ sub process {
 						$fixed[$fixlinenr] =~ s/$remove//;
 						$fixed[$fixlinenr] =~ s/\b__attribute__/$new __attribute__/;
 						$fixed[$fixlinenr] =~ s/\}\Q$new\E/} $new/;
+						$fixed[$fixlinenr] =~ s/ __attribute__\s*\(\s*\(\s*\)\s*\)//;
 					}
 				}
 			}
 
-			if (show_type("PREFER_DEFINED_ATTRIBUTE_MACRO") && $fix) {
-				$fixed[$fixlinenr] =~ s/ __attribute__\s*\(\s*\(\s*\)\s*\)//;
-			}
-
 			# Check for __attribute__ unused, prefer __always_unused or __maybe_unused
 			if ($attr =~ /^_*unused/) {
 				WARN("PREFER_DEFINED_ATTRIBUTE_MACRO",
_

Patches currently in -mm which might be from joe@perches.com are

checkpatch-prefer-static-const-declarations.patch
checkpatch-allow-fix-removal-of-unnecessary-break-statements.patch
checkpatch-update-__attribute__sectionname-quote-removal.patch
checkpatch-add-__alias-and-__weak-to-suggested-__attribute__-conversions.patch
checkpatch-add-printk_once-and-printk_ratelimit-to-prefer-pr_level-warning.patch
checkpatch-add-printk_once-and-printk_ratelimit-to-prefer-pr_level-warning-fix.patch