History

Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo: "Documentation updates and the addition of cgroup_parse_float() which will be used by new controllers including blk-iocost" * 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: docs: cgroup-v1: convert docs to ReST and rename to *.rst cgroup: Move cgroup_parse_float() implementation out of CONFIG_SYSFS cgroup: add cgroup_parse_float()

Linus Torvalds committed 7 years ago

Commit 92c1d652 parents df2a40f 99c8b2337 files · +1005 −643Browse files

Showing the changes to include/uapi/linux (1 of 37 files). Show all

Unified · Split

include/uapi/linux/bpf.h+1−1
@@ -785,7 +785,7 @@ union bpf_attr { · 784 unmodified lines
785 * based on a user-provided identifier for all traffic coming from785 * based on a user-provided identifier for all traffic coming from
786 * the tasks belonging to the related cgroup. See also the related786 * the tasks belonging to the related cgroup. See also the related
787 * kernel documentation, available from the Linux sources in file787 * kernel documentation, available from the Linux sources in file
788 * *Documentation/cgroup-v1/net_cls.txt*.788 * *Documentation/cgroup-v1/net_cls.rst*.
789 *789 *
790 * The Linux kernel has two versions for cgroups: there are790 * The Linux kernel has two versions for cgroups: there are
791 * cgroups v1 and cgroups v2. Both are available to users, who can791 * cgroups v1 and cgroups v2. Both are available to users, who can

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t