Merge "checkpatch: accept qca.qualcomm email addresses" into msm-4.9 (8c335b28) · Commits · e / devices / android_kernel_fairphone_FP3

scripts/checkpatch.pl

+19 −5

Original line number	Diff line number	Diff line
		@@ -65,6 +65,8 @@ my $codespellfile = "/usr/share/codespell/dictionary.txt";
		my $conststructsfile = "$D/const_structs.checkpatch";
		my $color = 1;
		my $allow_c99_comments = 1;
		my $qca_sign_off = 0;
		my $codeaurora_sign_off = 0;

		sub help {
		my ($exitcode) = @_;
		@@ -2609,10 +2611,16 @@ sub process {
		"email address '$email' might be better as '$suggested_email$comment'\n" . $herecurr);
		}
		}
		if ($chk_author && $line =~ /^\ssigned-off-by:.(quicinc\|qualcomm)\.com/i) {
		if ($chk_author) {
		if ($line =~ /^\ssigned-off-by:.qca\.qualcomm\.com/i) {
		$qca_sign_off = 1;
		} elsif ($line =~ /^\ssigned-off-by:.codeaurora\.org/i) {
		$codeaurora_sign_off = 1;
		} elsif ($line =~ /^\ssigned-off-by:.(quicinc\|qualcomm)\.com/i) {
		WARN("BAD_SIGN_OFF",
		"invalid Signed-off-by identity\n" . $line );
		}
		}

		# Check for duplicate signatures
		my $sig_nospace = $line;
		@@ -2745,7 +2753,8 @@ sub process {
		}

		#check the patch for invalid author credentials
		if ($chk_author && $line =~ /^From:.*(quicinc\|qualcomm)\.com/) {
		if ($chk_author && !($line =~ /^From:.*qca\.qualcomm\.com/) &&
		$line =~ /^From:.*(quicinc\|qualcomm)\.com/) {
		WARN("BAD_AUTHOR", "invalid author identity\n" . $line );
		}

		@@ -6419,6 +6428,11 @@ sub process {
		}
		}

		if ($chk_author && $qca_sign_off && !$codeaurora_sign_off) {
		WARN("BAD_SIGN_OFF",
		"QCA Signed-off-by requires CODEAURORA Signed-off-by\n" . $line );
		}

		# If we have no input at all, then there is nothing to report on
		# so just keep quiet.
		if ($#rawlines == -1) {