summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2013-07-0324-505/+1034
|\
| * cifs: fill TRANS2_QUERY_FILE_INFO ByteCount fieldsDavid Disseldorp2013-06-291-0/+2
| * cifs: fix SMB2 signing enablement in cifs_enable_signingJeff Layton2013-06-274-2/+14
| * [CIFS] Fix build warningSteve French2013-06-275-4/+8
| * [CIFS] SMB3 Signing enablementSteve French2013-06-268-2/+188
| * [CIFS] Do not set DFS flag on SMB2 openSteve French2013-06-261-7/+14
| * [CIFS] fix static checker warningSteve French2013-06-261-1/+2
| * cifs: try to handle the MUST SecurityFlags sanelyJeff Layton2013-06-261-0/+28
| * When server doesn't provide SecurityBuffer on SMB2Negotiate pick defaultSteve French2013-06-261-7/+11
| * Handle big endianness in NTLM (ntlmv2) authenticationSteve French2013-06-262-7/+7
| * revalidate directories instiantiated via FIND_* in order to handle DFS referralsJeff Layton2013-06-261-0/+29
| * SMB2 FSCTL and IOCTL worker functionSteve French2013-06-264-0/+147
| * Charge at least one credit, if server says that it supports multicreditSteve French2013-06-261-1/+8
| * Remove typoSteve French2013-06-261-1/+0
| * Some missing share flagsSteve French2013-06-261-2/+5
| * cifs: using strlcpy instead of strncpyZhao Hongjiang2013-06-262-2/+2
| * Update headers to update various SMB3 ioctl definitionsSteve French2013-06-243-3/+80
| * Update cifs version numberSteve French2013-06-241-1/+1
| * Add ability to dipslay SMB3 share flags and capabilities for debuggingSteve French2013-06-244-2/+26
| * Add some missing SMB3 and SMB3.02 flagsSteve French2013-06-241-5/+18
| * Add SMB3.02 dialect supportSteve French2013-06-245-0/+30
| * Fix endian error in SMB2 protocol negotiationSteve French2013-06-241-2/+2
| * cifs: clean up the SecurityFlags write handlerJeff Layton2013-06-241-6/+14
| * cifs: update the default global_secflags to include "raw" NTLMv2Jeff Layton2013-06-241-1/+1
| * move sectype to the cifs_ses instead of TCP_Server_InfoJeff Layton2013-06-247-180/+115
| * cifs: track the enablement of signing in the TCP_Server_InfoJeff Layton2013-06-2410-82/+71
| * add new fields to smb_vol to track the requested security flavorJeff Layton2013-06-242-0/+27
| * cifs: add new fields to cifs_ses to track requested security flavorJeff Layton2013-06-243-4/+13
| * cifs: track the flavor of the NEGOTIATE reponseJeff Layton2013-06-243-5/+16
| * cifs: add new "Unspecified" securityEnum valueJeff Layton2013-06-241-2/+2
| * cifs: factor out check for extended security bit into separate functionJeff Layton2013-06-241-9/+16
| * cifs: move handling of signed connections into separate functionJeff Layton2013-06-243-62/+40
| * cifs: break out lanman NEGOTIATE handling into separate functionJeff Layton2013-06-241-88/+97
| * cifs: break out decoding of security blob into separate functionJeff Layton2013-06-242-51/+62
| * cifs: remove the cifs_ses->flags fieldJeff Layton2013-06-244-29/+7
| * cifs: throw a warning if negotiate or sess_setup ops are passed NULL server o...Jeff Layton2013-06-243-19/+16
| * cifs: make decode_ascii_ssetup void returnJeff Layton2013-06-241-11/+7
| * cifs: remove useless memset in LANMAN auth codeJeff Layton2013-06-241-1/+0
| * cifs: remove protocolEnum definitionJeff Layton2013-06-241-6/+0
| * cifs: add a "nosharesock" mount option to force new sockets to server to be c...Jeff Layton2013-06-242-1/+9
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2013-07-0340-610/+985
|\ \
| * | tpm/tpm_i2c_infineon: Remove unused header filePeter Huewe2013-06-281-1/+0
| * | tpm: tpm_i2c_infinion: Don't modify i2c_client->driverLars-Peter Clausen2013-06-281-3/+0
| * | evm: audit integrity metadata failuresMimi Zohar2013-06-201-1/+14
| * | integrity: move integrity_audit_msg()Mimi Zohar2013-06-208-38/+41
| * | evm: calculate HMAC after initializing posix acl on tmpfsMimi Zohar2013-06-201-8/+8
| * | maintainers: add Dmitry KasatkinMimi Zohar2013-06-201-0/+1
| * | Merge branch 'smack-for-3.11' of git://git.gitorious.org/smack-next/kernel in...James Morris2013-06-114-280/+610
| |\ \
| | * | Smack: Fix the bug smackcipso can't set CIPSO correctlyPassion,Zhao2013-06-031-1/+1
| | * | Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()Tetsuo Handa2013-05-281-0/+2