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.
