tree 1eb117842e70b17e8b7e96a955cd0ef6f0f40732
parent 68a4ec9c03461e94a9577cf499069621bb074833
parent 7d13162332f2b67a941d18cee20f1c0413e020de
author Linus Torvalds <torvalds@linux-foundation.org> 1292543149 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292543149 -0800

Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  fanotify: fill in the metadata_len field on struct fanotify_event_metadata
  fanotify: split version into version and metadata_len
  fanotify: Dont try to open a file descriptor for the overflow event
  fanotify: Introduce FAN_NOFD
  fanotify: do not leak user reference on allocation failure
  inotify: stop kernel memory leak on file creation failure
  fanotify: on group destroy allow all waiters to bypass permission check
  fanotify: Dont allow a mask of 0 if setting or removing a mark
  fanotify: correct broken ref counting in case adding a mark failed
  fanotify: if set by user unset FMODE_NONOTIFY before fsnotify_perm() is called
  fanotify: remove packed from access response message
  fanotify: deny permissions when no event was sent