David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-04-15 21:16:30 -04:00

..

asn1.c

[CIFS] cifs: Rename cERROR and cFYI to cifs_dbg

2013-05-04 22:17:23 -05:00

cache.c

[CIFS] cifs: Rename cERROR and cFYI to cifs_dbg

2013-05-04 22:17:23 -05:00

cifs_debug.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

cifs_debug.h

lib: update single-char callers of strtobool()

2016-03-17 15:09:34 -07:00

cifs_dfs_ref.c

CIFS: add build_path_from_dentry_optional_prefix()

2017-03-01 22:26:10 -06:00

cifs_fs_sb.h

CIFS: Add new mount option to set owner uid and gid from special sids in acl

2016-10-14 14:22:01 -05:00

cifs_ioctl.h

Enable previous version support

2016-10-13 19:48:11 -05:00

cifs_spnego.c

cifs: Create dedicated keyring for spnego operations

2016-05-19 21:56:30 -05:00

cifs_spnego.h

[CIFS] Rename three structures to avoid camel case

2011-05-27 04:34:02 +00:00

cifs_unicode.c

File names with trailing period or space need special case conversion

2016-06-24 12:05:52 -05:00

cifs_unicode.h

CIFS: Fix sparse warnings

2017-03-02 23:11:54 -06:00

cifs_uniupr.h

…

cifsacl.c

CIFS: Retrieve uid and gid from special sid if enabled

2016-10-14 14:22:16 -05:00

cifsacl.h

cifs: fix SID binary to string conversion

2012-12-11 11:48:49 -06:00

cifsencrypt.c

CIFS: Encrypt SMB3 requests before sending

2017-02-01 16:46:36 -06:00

cifsfs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-15 21:16:30 -04:00

cifsfs.h

Introduce cifs_copy_file_range()

2017-04-07 08:04:41 -05:00

cifsglob.h

CIFS: remove bad_network_name flag

2017-04-10 23:36:39 -05:00

cifspdu.h

CIFS: move DFS response parsing out of SMB1 code

2017-03-01 22:26:10 -06:00

cifsproto.h

CIFS: Fix null pointer deref during read resp processing

2017-04-10 23:36:38 -05:00

cifssmb.c

CIFS: Fix null pointer deref during read resp processing

2017-04-10 23:36:38 -05:00

connect.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-15 21:16:30 -04:00

dir.c

CIFS: add build_path_from_dentry_optional_prefix()

2017-03-01 22:26:10 -06:00

dns_resolve.c

cifs: fix composing of mount options for DFS referrals

2013-05-24 13:08:31 -05:00

dns_resolve.h

…

export.c

[CIFS] cifs: Rename cERROR and cFYI to cifs_dbg

2013-05-04 22:17:23 -05:00

file.c

CIFS: store results of cifs_reopen_file to avoid infinite wait

2017-04-10 23:36:39 -05:00

fscache.c

NFS client updates for Linux 3.13

2013-11-08 05:57:46 +09:00

fscache.h

CIFS: FS-Cache: Uncache unread pages in cifs_readpages() before freeing them

2013-09-18 10:17:03 -05:00

inode.c

Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-03-03 11:38:56 -08:00

ioctl.c

Introduce cifs_copy_file_range()

2017-04-07 08:04:41 -05:00

Kconfig

CIFS: Encrypt SMB3 requests before sending

2017-02-01 16:46:36 -06:00

link.c

cifs: use %16phN for formatting md5 sum

2016-12-15 00:21:37 -06:00

Makefile

cifs: Switch to generic xattr handlers

2016-04-23 15:33:03 -04:00

misc.c

CIFS: move DFS response parsing out of SMB1 code

2017-03-01 22:26:10 -06:00

netmisc.c

Fix signed/unsigned pointer warning

2014-12-14 14:55:57 -06:00

nterr.c

CIFS: Rename 7 error codes to NT_ style

2012-07-24 10:25:10 -05:00

nterr.h

CIFS: Rename 7 error codes to NT_ style

2012-07-24 10:25:10 -05:00

ntlmssp.h

cifs: dynamic allocation of ntlmssp blob

2016-06-23 23:45:07 -05:00

readdir.c

cifs: initialize file_info_lock

2017-01-14 14:58:29 -06:00

rfc1002pdu.h

…

sess.c

smb2: Enforce sec= mount option

2017-03-02 23:13:37 -06:00

smb1ops.c

smb2: Enforce sec= mount option

2017-03-02 23:13:37 -06:00

smb2file.c

CIFS: add use_ipc flag to SMB2_ioctl()

2017-03-01 22:26:11 -06:00

smb2glob.h

CIFS: Separate SMB2 header structure

2017-02-01 16:46:34 -06:00

smb2inode.c

Do not send SMB3 SET_INFO request if nothing is changing

2016-10-13 19:46:51 -05:00

smb2maperror.c

CIFS: Separate SMB2 header structure

2017-02-01 16:46:34 -06:00

smb2misc.c

Handle mismatched open calls

2017-04-07 08:04:40 -05:00

smb2ops.c

CIFS: Fix null pointer deref during read resp processing

2017-04-10 23:36:38 -05:00

smb2pdu.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-15 21:16:30 -04:00

smb2pdu.h

CIFS: implement get_dfs_refer for SMB2+

2017-03-02 17:05:31 -06:00

smb2proto.h

Handle mismatched open calls

2017-04-07 08:04:40 -05:00

smb2status.h

CIFS: Add SMB2 status codes

2012-07-24 10:25:13 -05:00

smb2transport.c

Handle mismatched open calls

2017-04-07 08:04:40 -05:00

smbencrypt.c

cifs: Fix smbencrypt() to stop pointing a scatterlist at the stack

2016-12-14 01:44:16 -06:00

smberr.h

…

smbfsctl.h

[SMB3] Send durable handle v2 contexts when use of persistent handles required

2015-11-03 09:26:27 -06:00

transport.c

Handle mismatched open calls

2017-04-07 08:04:40 -05:00

winucase.c

[CIFS] quiet sparse compile warning

2013-09-08 14:54:24 -05:00

xattr.c

Add way to query creation time of file via cifs xattr

2016-10-12 12:08:31 -05:00