summaryrefslogtreecommitdiff
path: root/fs/timerfd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-08 03:44:36 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-08 03:44:36 +0300
commit3ea4fcc5fe7f990266ddd3139ef5ae66d625bd13 (patch)
treef69437c7355e79ef9070a90442645b99ca617f8d /fs/timerfd.c
parent1a86fc754fc2bae3be5fe00c1b553b91ba20e089 (diff)
parent966681c9f029afd5decee069b7658bb58ad0a863 (diff)
downloadlinux-3ea4fcc5fe7f990266ddd3139ef5ae66d625bd13.tar.xz
Merge tag 'cifs-bug-fixes-for-4.13' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French: "First set of CIFS/SMB3 fixes for the merge window. Also improves POSIX character mapping for SMB3" * tag 'cifs-bug-fixes-for-4.13' of git://git.samba.org/sfrench/cifs-2.6: CIFS: fix circular locking dependency cifs: set oparms.create_options rather than or'ing in CREATE_OPEN_BACKUP_INTENT cifs: Do not modify mid entry after submitting I/O in cifs_call_async CIFS: add SFM mapping for 0x01-0x1F cifs: hide unused functions cifs: Use smb 2 - 3 and cifsacl mount options getacl functions cifs: prototype declaration and definition for smb 2 - 3 and cifsacl mount options CIFS: add CONFIG_CIFS_DEBUG_KEYS to dump encryption keys cifs: set mapping error when page writeback fails in writepage or launder_pages SMB3: Enable encryption for SMB3.1.1
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions