linux-kernel - Re: linux-next: manual merge of the printk tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 16 Jan 2018 11:38:11 +0100
From:   Petr Mladek <pmladek@...e.com>
To:     Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Tobin C. Harding" <me@...in.cc>,
        Sergey Senozhatsky <sergey.senozhatsky@...il.com>,
        Joe Perches <joe@...ches.com>
Subject: Re: linux-next: manual merge of the printk tree with Linus' tree

On Tue 2018-01-16 11:04:09, Sergey Senozhatsky wrote:
> On (01/16/18 09:23), Stephen Rothwell wrote:
> > Today's linux-next merge of the printk tree got a conflict in:
> > 
> >   scripts/checkpatch.pl
> > 
> > between commit:
> > 
> >   7b1924a1d930 ("vsprintf: add printk specifier %px")
> > 
> > from Linus' tree and commit:
> > 
> >   1df7338ac965 ("checkpatch: add pF/pf deprecation warning")
> > 
> > from the printk tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> looks correct to me. thanks.

Yup, it looks correct to me as well.

Best Regards,
Petr