Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346347
b: refs/heads/master
c: 8ec7d50
h: refs/heads/master
i:
  346345: ddcb800
  346343: ebd9160
v: v3
  • Loading branch information
Tao Ma authored and Linus Torvalds committed Dec 18, 2012
1 parent d8c647b commit d558810
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66d93341b507185d6934756fb6f6b69b42ff43e4
refs/heads/master: 8ec7d50f1ed2b072d23ce810f86df09ee0568d4b
1 change: 0 additions & 1 deletion trunk/kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,6 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
if (ret)
goto out_unlock;

/* See feature-removal-schedule.txt */
if (opts.subsys_mask != root->actual_subsys_mask || opts.release_agent)
pr_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
task_tgid_nr(current), current->comm);
Expand Down
3 changes: 0 additions & 3 deletions trunk/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,6 @@ static bool check_symbol(const struct symsearch *syms,
printk(KERN_WARNING "Symbol %s is being used "
"by a non-GPL module, which will not "
"be allowed in the future\n", fsa->name);
printk(KERN_WARNING "Please see the file "
"Documentation/feature-removal-schedule.txt "
"in the kernel source tree for more details.\n");
}
}

Expand Down

0 comments on commit d558810

Please sign in to comment.