From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Mar 2014 17:17:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=adf961d7e8006d2cb16ceee07582b145b9ef69f7;p=linux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull audit namespace fixes from Eric Biederman:
 "Starting with 3.14-rc1 the audit code is faulty (think oopses and
  races) with respect to how it computes the network namespace of which
  socket to reply to, and I happened to notice by chance when reading
  through the code.

  My testing and the automated build bots don't find any problems with
  these fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  audit: Update kdoc for audit_send_reply and audit_list_rules_send
  audit: Send replies in the proper network namespace.
  audit: Use struct net not pid_t to remember the network namespce to reply in
---

adf961d7e8006d2cb16ceee07582b145b9ef69f7