Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Rejecting non-native endian BTF overlapped with the addition of support for it. The rest were more simple overlapping changes, except the renesas ravb binding update, which had to follow a file move as well as a YAML conversion. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -866,7 +866,7 @@ static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
|
||||
[ETHNL_MCGRP_MONITOR] = { .name = ETHTOOL_MCGRP_MONITOR_NAME },
|
||||
};
|
||||
|
||||
static struct genl_family ethtool_genl_family = {
|
||||
static struct genl_family ethtool_genl_family __ro_after_init = {
|
||||
.name = ETHTOOL_GENL_NAME,
|
||||
.version = ETHTOOL_GENL_VERSION,
|
||||
.netnsok = true,
|
||||
|
Reference in New Issue
Block a user