Messages in this thread | | | Date | Mon, 14 Jan 2019 11:02:04 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the vfs-fixes tree |
| |
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 [unhandled content-type:application/pgp-signature] | |