]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2093837 83d1001)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 15:43:54 +0000 (07:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 15:43:54 +0000 (07:43 -0800)
commit7eb6a4da24b75d7cb710dc5c4e0f13259a290a53
tree0adc818f569f45912a19482773dabbf71b191b9dtree | snapshot
parent2093837cb4b73efd9b064ef4d56a8343223df23ecommit | diff
parent83d10015be9147195be16c9ae398f520b5c60e87commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix ioctl ABI
  fuse: allow batching of FORGET requests
  fuse: separate queue for FORGET requests
  fuse: ioctl cleanup

Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done
the RCU-freeing of the inode in fuse_destroy_inode().
fs/fuse/dir.c diff1 | diff2 | blob | history
fs/fuse/inode.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.