linux-next: manual merge of the cgroup tree with the net-next tree

[Stephen Rothwell]

Hi Tejun,

Today's linux-next merge of the cgroup tree got a conflict in
net/sched/cls_cgroup.c between commit 6a328d8c6f03 ("cgroup: net_cls:
Rework update socket logic") from the net-next tree and commits
92fb97487a7e ("cgroup: rename ->create/post_create/pre_destroy/destroy()
to ->css_alloc/online/offline/free()") and 0ba18f7a5e26 ("netcls_cgroup:
move config inheritance to ->css_online() and remove .broken_hierarchy
marking") from the cgroup tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc net/sched/cls_cgroup.c
index 709b0fb,31f06b6..0000000
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@@ -98,9 -79,9 +102,10 @@@ static struct cftype ss_files[] = 
  
  struct cgroup_subsys net_cls_subsys = {
  	.name		= "net_cls",
- 	.create		= cgrp_create,
- 	.destroy	= cgrp_destroy,
+ 	.css_alloc	= cgrp_css_alloc,
+ 	.css_online	= cgrp_css_online,
+ 	.css_free	= cgrp_css_free,
 +	.attach		= cgrp_attach,
  	.subsys_id	= net_cls_subsys_id,
  	.base_cftypes	= ss_files,
  	.module		= THIS_MODULE,

Attachment: pgp00000.pgp
Description: PGP signature