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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]

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;
  					}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Rafael J. Wysocki]

On Friday, November 15, 2019 1:05:00 AM CET Stephen Rothwell wrote:
> 
> --Sig_/8dHD0qGh0F9UnYxbYqUlngQ
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
> 
> 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 extensio=
> n '%pe'")
> 
> from the printk tree and commit:
> 
>   3bd32d6a2ee6 ("lib/vsprintf: Add %pfw conversion specifier for printing f=
> wnode names")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, and it looks good to me.

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

[Sakari Ailus]

On Fri, Nov 15, 2019 at 11:46:53AM +0100, Rafael J. Wysocki wrote:
> On Friday, November 15, 2019 1:05:00 AM CET Stephen Rothwell wrote:
> > 
> > --Sig_/8dHD0qGh0F9UnYxbYqUlngQ
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> > 
> > 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 extensio=
> > n '%pe'")
> > 
> > from the printk tree and commit:
> > 
> >   3bd32d6a2ee6 ("lib/vsprintf: Add %pfw conversion specifier for printing f=
> > wnode names")
> > 
> > from the pm tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> Thanks, and it looks good to me.

The change seems fine to me as well.

Thanks.

-- 
Sakari Ailus

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

[Sakari Ailus]

On Fri, Oct 18, 2019 at 11:34:08AM +0200, Rafael J. Wysocki wrote:
> On Friday, October 18, 2019 1:19:38 AM CEST Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the pm tree got a conflict in:
> > 
> >   lib/test_printf.c
> > 
> > between commit:
> > 
> >   57f5677e535b ("printf: add support for printing symbolic error names")
> > 
> > from the printk tree and commit:
> > 
> >   f1ce39df508d ("lib/test_printf: Add tests for %pfw printk modifier")
> > 
> > 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.
> 
> The resolution looks good to me, thank you!
> 
> Sakari, please double check.

Yes, it's fine.

Thanks.

-- 
Sakari Ailus

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

[Rafael J. Wysocki]

On Friday, October 18, 2019 1:19:38 AM CEST Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   lib/test_printf.c
> 
> between commit:
> 
>   57f5677e535b ("printf: add support for printing symbolic error names")
> 
> from the printk tree and commit:
> 
>   f1ce39df508d ("lib/test_printf: Add tests for %pfw printk modifier")
> 
> 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.

The resolution looks good to me, thank you!

Sakari, please double check.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2824 bytes --]

Hi all,

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

  lib/test_printf.c

between commit:

  57f5677e535b ("printf: add support for printing symbolic error names")

from the printk tree and commit:

  f1ce39df508d ("lib/test_printf: Add tests for %pfw printk modifier")

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 lib/test_printf.c
index 030daeb4fe21,422b847db424..000000000000
--- a/lib/test_printf.c
+++ b/lib/test_printf.c
@@@ -593,26 -595,35 +595,55 @@@ flags(void
  	kfree(cmp_buffer);
  }
  
+ static void __init fwnode_pointer(void)
+ {
+ 	const struct software_node softnodes[] = {
+ 		{ .name = "first", },
+ 		{ .name = "second", .parent = &softnodes[0], },
+ 		{ .name = "third", .parent = &softnodes[1], },
+ 		{ NULL /* Guardian */ }
+ 	};
+ 	const char * const full_name = "first/second/third";
+ 	const char * const full_name_second = "first/second";
+ 	const char * const second_name = "second";
+ 	const char * const third_name = "third";
+ 	int rval;
+ 
+ 	rval = software_node_register_nodes(softnodes);
+ 	if (rval) {
+ 		pr_warn("cannot register softnodes; rval %d\n", rval);
+ 		return;
+ 	}
+ 
+ 	test(full_name_second, "%pfw", software_node_fwnode(&softnodes[1]));
+ 	test(full_name, "%pfw", software_node_fwnode(&softnodes[2]));
+ 	test(full_name, "%pfwf", software_node_fwnode(&softnodes[2]));
+ 	test(second_name, "%pfwP", software_node_fwnode(&softnodes[1]));
+ 	test(third_name, "%pfwP", software_node_fwnode(&softnodes[2]));
+ 
+ 	software_node_unregister_nodes(softnodes);
+ }
+ 
 +static void __init
 +errptr(void)
 +{
 +	test("-1234", "%pe", ERR_PTR(-1234));
 +
 +	/* Check that %pe with a non-ERR_PTR gets treated as ordinary %p. */
 +	BUILD_BUG_ON(IS_ERR(PTR));
 +	test_hashed("%pe", PTR);
 +
 +#ifdef CONFIG_SYMBOLIC_ERRNAME
 +	test("(-ENOTSOCK)", "(%pe)", ERR_PTR(-ENOTSOCK));
 +	test("(-EAGAIN)", "(%pe)", ERR_PTR(-EAGAIN));
 +	BUILD_BUG_ON(EAGAIN != EWOULDBLOCK);
 +	test("(-EAGAIN)", "(%pe)", ERR_PTR(-EWOULDBLOCK));
 +	test("[-EIO    ]", "[%-8pe]", ERR_PTR(-EIO));
 +	test("[    -EIO]", "[%8pe]", ERR_PTR(-EIO));
 +	test("-EPROBE_DEFER", "%pe", ERR_PTR(-EPROBE_DEFER));
 +#endif
 +}
 +
  static void __init
  test_pointer(void)
  {
@@@ -635,7 -646,7 +666,8 @@@
  	bitmap();
  	netdev_features();
  	flags();
 +	errptr();
+ 	fwnode_pointer();
  }
  
  static void __init selftest(void)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]