diff options
author | Tejun Heo <tj@kernel.org> | 2022-09-23 07:19:38 -1000 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2022-09-23 07:19:38 -1000 |
commit | 026e14a276c67c8433ecb10e557f0ba23d2b6636 (patch) | |
tree | 8f57de61bfe542eebbf26f38f237e57f4850cec1 /net/dsa/slave.c | |
parent | cgroup/cpuset: remove unreachable code (diff) | |
parent | cgroup: cgroup_get_from_id() must check the looked-up kn is a directory (diff) | |
download | linux-dev-026e14a276c67c8433ecb10e557f0ba23d2b6636.tar.xz linux-dev-026e14a276c67c8433ecb10e557f0ba23d2b6636.zip |
Merge branch 'for-6.0-fixes' into for-6.1
for-6.0 has the following fix for cgroup_get_from_id().
836ac87d ("cgroup: fix cgroup_get_from_id")
which conflicts with the following two commits in for-6.1.
4534dee9 ("cgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id")
fa7e439c ("cgroup: Homogenize cgroup_get_from_id() return value")
While the resolution is straightforward, the code ends up pretty ugly
afterwards. Let's pull for-6.0-fixes into for-6.1 so that the code can be
fixed up there.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index ad6a6663feeb..1291c2431d44 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -2484,7 +2484,7 @@ static int dsa_slave_changeupper(struct net_device *dev, if (!err) dsa_bridge_mtu_normalization(dp); if (err == -EOPNOTSUPP) { - if (!extack->_msg) + if (extack && !extack->_msg) NL_SET_ERR_MSG_MOD(extack, "Offloading not supported"); err = 0; |