diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 22:08:43 -0400 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 22:08:43 -0400 | 
| commit | b1cce8032f6abe900b078d24f3c3938726528f97 (patch) | |
| tree | a387bf49544b0620af61781e3438a908c951a6a3 /net/tipc/socket.c | |
| parent | 1c54fc1efe6922b4e7ffd591739d72050976ccd6 (diff) | |
| parent | 663a962151593c69374776e8651238d0da072459 (diff) | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French.
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix memory leaks in SMB2_open
  cifs: ensure that vol->username is not NULL before running strlen on it
  Clarify SMB2/SMB3 create context and add missing ones
  Do not send ClientGUID on SMB2.02 dialect
  cifs: Set client guid on per connection basis
  fs/cifs/netmisc.c: convert printk to pr_foo()
  fs/cifs/cifs.c: replace seq_printf by seq_puts
  Update cifs version number to 2.03
  fs: cifs: new helper: file_inode(file)
  cifs: fix potential races in cifs_revalidate_mapping
  cifs: new helper function: cifs_revalidate_mapping
  cifs: convert booleans in cifsInodeInfo to a flags field
  cifs: fix cifs_uniqueid_to_ino_t not to ever return 0
Diffstat (limited to 'net/tipc/socket.c')
0 files changed, 0 insertions, 0 deletions
