Merge branch 'usermode-driver-cleanup' of git://git.kernel.org/pub/scm/linux/kernel...

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc net/bpfilter/bpfilter_kern.c
index 1905e01c3aa9a7f92f949877f82e72e45d90f8d4,9616fb7defebe9b28e57a27712024b52f3eea4ae..54f82c341e20b38a510d11b280234ddebe370df9
--- 1/net/bpfilter/bpfilter_kern.c
--- 2/net/bpfilter/bpfilter_kern.c
+++ b/net/bpfilter/bpfilter_kern.c
@@@ -48,9 -46,9 +46,9 @@@ static int __bpfilter_process_sockopt(s
        req.cmd = optname;
        req.addr = (long __force __user)optval;
        req.len = optlen;
-       if (!bpfilter_ops.info.pid)
+       if (!bpfilter_ops.info.tgid)
                goto out;
 -      n = __kernel_write(bpfilter_ops.info.pipe_to_umh, &req, sizeof(req),
 +      n = kernel_write(bpfilter_ops.info.pipe_to_umh, &req, sizeof(req),
                           &pos);
        if (n != sizeof(req)) {
                pr_err("write fail %zd\n", n);