]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit - Documentation/cgroup-v2.txt
projects / mirror_ubuntu-jammy-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 576dd46 7896dfb)
Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11
authorTejun Heo <tj@kernel.org>
Thu, 2 Feb 2017 18:50:35 +0000 (13:50 -0500)
committerTejun Heo <tj@kernel.org>
Thu, 2 Feb 2017 18:50:35 +0000 (13:50 -0500)
commit63f1ca59453aadae81f702840c7ac6ea8b9f9262
tree5dc559d4dc33c8e1408f757d8853b23033ea118ftree
parent576dd464505fc53d501bb94569db76f220104d28commit | diff
parent7896dfb0a6180beb51bf34b32c9427984cb052c4commit | diff
Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11

Merge in to resolve conflicts in Documentation/cgroup-v2.txt.  The
conflicts are from multiple section additions and trivial to resolve.

Signed-off-by: Tejun Heo <tj@kernel.org>
Documentation/cgroup-v2.txt diff1 | diff2 | blob | history
Ubuntu Jammy Linux kernel mirror