projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 00cfaa9 f563b89)
Merge branch 'bugfixes' into linux-next
authorTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 13 Jul 2014 19:22:02 +0000 (15:22 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 13 Jul 2014 19:22:02 +0000 (15:22 -0400)
commite655f945cd7ba2a8360ddd5462ca535a3b41e07e
treec4ea74ad13b1c0a1956bdcf507ef26de70f35511tree | snapshot (tar.gz zip)
parent00cfaa943ec30abbc7109b0b918e0b6a0eef07dccommit | diff
parentf563b89b182594f827b4100bd34f916339785a77commit | diff
Merge branch 'bugfixes' into linux-next

* bugfixes:
  NFS: Don't reset pg_moreio in __nfs_pageio_add_request
  NFS: Remove 2 unused variables
  nfs: handle multiple reqs in nfs_wb_page_cancel
  nfs: handle multiple reqs in nfs_page_async_flush
  nfs: change find_request to find_head_request
  nfs: nfs_page should take a ref on the head req
  nfs: mark nfs_page reqs with flag for extra ref
  nfs: only show Posix ACLs in listxattr if actually present

Conflicts:
fs/nfs/write.c
fs/nfs/direct.c diff1 | diff2 | blob | history
fs/nfs/internal.h diff1 | diff2 | blob | history
fs/nfs/nfs3proc.c diff1 | diff2 | blob | history
fs/nfs/pagelist.c diff1 | diff2 | blob | history
fs/nfs/write.c diff1 | diff2 | blob | history