From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Oct 2016 20:36:19 +0000 (-0700)
Subject: Merge tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux
X-Git-Tag: v4.9-rc1~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c35bcfd8e4e11bdff2ffab823a13a59968426b15;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux

Pull file locking updates from Jeff Layton:
 "Only a single patch from Nikolay this cycle, with a small change to
  better handle /proc/locks in a containerized host"

* tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux:
  locks: Filter /proc/locks output on proc pid ns
---

c35bcfd8e4e11bdff2ffab823a13a59968426b15