Subject: linux-next: manual merge of the pm tree with the printk tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 15 Nov 2019 11:05:00 +1100

Hi all,

Today's linux-next merge of the pm tree got a conflict in:

  scripts/checkpatch.pl

between commit:

  1d28122131b2 ("checkpatch: don't warn about new vsprintf pointer extension '%pe'")

from the printk tree and commit:

  3bd32d6a2ee6 ("lib/vsprintf: Add %pfw conversion specifier for printing fwnode names")

from the pm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc scripts/checkpatch.pl
index 4b40445938dc,3d1f08fa091c..000000000000
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@@ -6019,10 -6020,13 +6020,13 @@@ sub process 
  				my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
  				$fmt =~ s/%%//g;
  
- 				while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) {
+ 				while ($fmt =~ /(\%[\*\d\.]*p(\w)(\w*))/g) {
  					$specifier = $1;
  					$extension = $2;
- 					if ($extension !~ /[SsBKRraEehMmIiUDdgVCbGNOxt]/) {
+ 					$qualifier = $3;
 -					if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxtf]/ ||
++					if ($extension !~ /[SsBKRraEehMmIiUDdgVCbGNOxtf]/ ||
+ 					    ($extension eq "f" &&
+ 					     defined $qualifier && $qualifier !~ /^w/)) {
  						$bad_specifier = $specifier;
  						last;
  					}