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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
