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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2126744.rv85diC2z5@kreacher>
Date:   Fri, 15 Nov 2019 11:46:53 +0100
From:   "Rafael J. Wysocki" <rjw@...ysocki.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Petr Mladek <pmladek@...e.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>,
        Sakari Ailus <sakari.ailus@...ux.intel.com>
Subject: Re: linux-next: manual merge of the pm tree with the printk tree

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.