Hi all,
Today's linux-next merge of the printk tree got a conflict in:
include/trace/events/sunrpc.h
between commit:
6f701383368d ("SUNRPC: Display symbolic flag names in RPC trace events")
from Linus' tree and commit:
d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps
Hi all,
Today's linux-next merge of the printk tree got a conflict in:
mm/memblock.c
between commit:
26fb3dae0a1e ("memblock: drop memblock_alloc_*_nopanic() variants")
from Linus' tree and commit:
d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps and %pS,
respective
Hi all,
Today's linux-next merge of the printk tree got conflicts in:
drivers/base/power/main.c
between commit:
7a5bd1279bce ("PM: Add and use pr_fmt()")
from Linus' tree and commit:
d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps and %pS,
respectively")
from the
Hi Petr,
Today's linux-next merge of the printk tree got a conflict in:
lib/vsprintf.c
between commit:
85f4f12d51397f164 ("vsprintf: Replace memory barrier with static_key for
random_ptr_key update")
from Linus' tree and commits:
558594f3c2a5cd65f ("lib/vsprintf: Move pointer_string()
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")
> >
> > f
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 de
Hi Petr,
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
7 matches
Mail list logo
