diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 10:43:32 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 10:43:32 -0700 | 
| commit | dabcbb1bae0f55378060b285062b20f6ec648c6a (patch) | |
| tree | 027cdd35ce43cce95a78afab22e1e809b436b636 /scripts/conmakehash.c | |
| parent | 5619a693965b291315685bdfe01a0246ebd7e41e (diff) | |
| parent | e0c8ea1a69410ef44043646938a6a4175f5307e4 (diff) | |
Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
* '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6: (52 commits)
  Fix build break when freezer not configured
  Add definition for share encryption
  CIFS: Make cifs_push_locks send as many locks at once as possible
  CIFS: Send as many mandatory unlock ranges at once as possible
  CIFS: Implement caching mechanism for posix brlocks
  CIFS: Implement caching mechanism for mandatory brlocks
  CIFS: Fix DFS handling in cifs_get_file_info
  CIFS: Fix error handling in cifs_readv_complete
  [CIFS] Fixup trivial checkpatch warning
  [CIFS] Show nostrictsync and noperm mount options in /proc/mounts
  cifs, freezer: add wait_event_freezekillable and have cifs use it
  cifs: allow cifs_max_pending to be readable under /sys/module/cifs/parameters
  cifs: tune bdi.ra_pages in accordance with the rsize
  cifs: allow for larger rsize= options and change defaults
  cifs: convert cifs_readpages to use async reads
  cifs: add cifs_async_readv
  cifs: fix protocol definition for READ_RSP
  cifs: add a callback function to receive the rest of the frame
  cifs: break out 3rd receive phase into separate function
  cifs: find mid earlier in receive codepath
  ...
Diffstat (limited to 'scripts/conmakehash.c')
0 files changed, 0 insertions, 0 deletions
