]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c93b85d 7923c5f)
Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 26 Nov 2015 04:08:58 +0000 (20:08 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 26 Nov 2015 04:08:58 +0000 (20:08 -0800)
* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  Revert "nfs: take extra reference to fl->fl_file when running a LOCKU operation"

1  2 
fs/nfs/nfs4proc.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/nfs4proc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.