]> www.infradead.org Git - users/hch/configfs.git/commitdiff
projects / users / hch / configfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9689519 5f785de)
Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Dec 2014 21:36:57 +0000 (13:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Dec 2014 21:36:57 +0000 (13:36 -0800)
Pull aio updates from Benjamin LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: Skip timer for io_getevents if timeout=0
  aio: Make it possible to remap aio ring

1  2 
include/linux/fs.h patch | diff1 | diff2 | blob | history
mm/mremap.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/fs.h
Simple merge
diff --cc mm/mremap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.