Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.
Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444
("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@ -5259,7 +5259,7 @@ static int print_arg_pointer(struct trace_seq *s, const char *format, int plen,
|
||||
default:
|
||||
ret = 0;
|
||||
val = eval_num_arg(data, size, event, arg);
|
||||
trace_seq_printf(s, "%p", (void *)val);
|
||||
trace_seq_printf(s, "%p", (void *)(intptr_t)val);
|
||||
break;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user