lkml.org 
[lkml]   [2019]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2019-01-14 01:03    [W:0.022 / U:0.160 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site