| commit | 0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Mar 06 00:53:44 2018 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Mar 06 01:20:46 2018 -0500 |
| tree | 439c89ea3c87496c23e167148f2cdbefb6e82b30 | |
| parent | ef3f6c256f0b4711a3ef1489797b95820be5ab01 [diff] | |
| parent | ce380619fab99036f5e745c7a865b21c59f005f6 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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: David S. Miller <davem@davemloft.net>