Skip to content
Commit 0f3e9c97 authored by David S. Miller's avatar David S. Miller
Browse files


All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ef3f6c25 ce380619
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment