]> www.infradead.org Git - users/jedix/linux-maple.git/commit
add user_struct element unix_inflight pre-req for "pipe: limit the per-user amount...
authorChuck Anderson <chuck.anderson@oracle.com>
Fri, 10 Jun 2016 20:53:15 +0000 (13:53 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 10 Jun 2016 20:53:15 +0000 (13:53 -0700)
commit0c8ecee92c2241adf9ca910aa42ef0112913b817
tree3153a66c117edb4a6c7f383c8377ab8160b52a11
parent4ad54a43a77122e39adeb556ac8626069ebd4f10
add user_struct element unix_inflight pre-req for "pipe: limit the per-user amount of pages allocated in pipes"

The commit: pipe: limit the per-user amount of pages allocated in pipes
caused a merge conflict with uek/uek-4.1 due to:
c057264c4ba7ddf9d775c013fcb1cecb910bf2b9
fix kABI breakage from "unix: properly account for FDs passed over unix sock

Add include/linux/sched.h user_struct change from c057264c so that the
code context matches uek/uek-4.1

Orabug: 22901731
Signed-off-by: Chuck Anderson <chuck.anderson@oracle.com>
include/linux/sched.h