Hi all, Today's linux-next merge of the vfs tree got a conflict in:
kernel/cgroup/cgroup-v1.c
between commit:
61aa329d0762 ("cgroup: saner refcounting for cgroup_root")
from the vfs-fixes tree and commit:
b3678086951a ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
from the vfs tree.
I couldn't figure out how to fix this up, so I effectively reverted the
vfs-fixes tree change. Al, can you either do the merge yourself, or
provide me with a merge fix, please.
--
Cheers,
Stephen Rothwell
pgpN0j3K43Onc.pgp
Description: OpenPGP digital signature
