Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/core/devlink.c: In function 'devlink_resource_validate_size': net/core/devlink.c:2349:34: error: invalid type argument of '->' (have 'struct devlink_resource_size_params') if (size > resource->size_params->size_max) { ^~ net/core/devlink.c:2354:34: error: invalid type argument of '->' (have 'struct devlink_resource_size_params') if (size < resource->size_params->size_min) { ^~ net/core/devlink.c:2359:43: error: invalid type argument of '->' (have 'struct devlink_resource_size_params') div64_u64_rem(size, resource->size_params->size_granularity, &reminder); ^~ Caused by commit cc944ead839a ("devlink: Move size validation to core") interacting with commit 77d270967c5f ("mlxsw: spectrum: Fix handling of resource_size_param") from the net tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Thu, 1 Mar 2018 10:24:31 +1100 Subject: [PATCH] devlink: merge fix up for resource_size_param changes Signed-off-by: Stephen Rothwell --- net/core/devlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index e7cb957d9efb..1b5bf0d1cee9 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -2346,17 +2346,17 @@ devlink_resource_validate_size(struct devlink_resource *resource, u64 size, u64 reminder; int err = 0; - if (size > resource->size_params->size_max) { + if (size > resource->size_params.size_max) { NL_SET_ERR_MSG_MOD(extack, "Size larger than maximum"); err = -EINVAL; } - if (size < resource->size_params->size_min) { + if (size < resource->size_params.size_min) { NL_SET_ERR_MSG_MOD(extack, "Size smaller than minimum"); err = -EINVAL; } - div64_u64_rem(size, resource->size_params->size_granularity, &reminder); + div64_u64_rem(size, resource->size_params.size_granularity, &reminder); if (reminder) { NL_SET_ERR_MSG_MOD(extack, "Wrong granularity"); err = -EINVAL; -- 2.16.1 -- Cheers, Stephen Rothwell