David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
9p	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-03-03 21:44:35 -08:00
adfs
affs
afs	rxrpc: Use negative error codes in rxrpc_call struct	2017-04-06 10:11:56 +01:00
autofs4
befs
bfs
btrfs	Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2017-04-14 16:53:45 -07:00
cachefiles
ceph
cifs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
coda
configfs
cramfs
crypto	A code cleanup and bugfix for fs/crypto.	2017-03-25 15:36:56 -07:00
debugfs
devpts
dlm	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
ecryptfs
efivarfs
efs
exofs
exportfs
ext2
ext4	statx: Include a mask for stx_attributes in struct statx	2017-04-03 01:06:00 -04:00
f2fs	f2fs: combine nat_bits and free_nid_bitmap cache	2017-03-20 10:00:18 -04:00
fat	fat: fix using uninitialized fields of fat_inode/fsinfo_inode	2017-03-09 17:01:10 -08:00
freevxfs
fscache
fuse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse	2017-03-03 12:14:13 -08:00
gfs2	gfs2: Avoid alignment hole in struct lm_lockname	2017-03-15 10:06:07 -04:00
hfs	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-03-03 21:44:35 -08:00
hfsplus
hostfs
hpfs
hugetlbfs	hugetlbfs: fix offset overflow in hugetlbfs mmap	2017-04-13 18:24:21 -07:00
isofs
jbd2	jbd2: don't leak memory if setting up journal fails	2017-03-15 15:08:48 -04:00
jffs2
jfs
kernfs	kernfs: Check KERNFS_HAS_RELEASE before calling kernfs_release_file()	2017-03-17 10:25:59 +09:00
lockd
minix
ncpfs
nfs	NFS client fixes for 4.11 (part 2)	2017-03-31 12:29:03 -07:00
nfs_common
nfsd	nfsd: fix oops on unsupported operation	2017-04-13 11:18:56 -04:00
nilfs2
nls
notify
ntfs
ocfs2	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
omfs
openpromfs
orangefs	orangefs: free superblock when mount fails	2017-04-15 09:39:31 -07:00
overlayfs	overlayfs: remove now unnecessary header file include	2017-03-08 10:42:13 -08:00
proc	thp: fix MADV_DONTNEED vs clear soft dirty race	2017-04-13 18:24:21 -07:00
pstore
qnx4
qnx6
quota
ramfs
reiserfs
romfs
squashfs
sysfs	sysfs: be careful of error returns from ops->show()	2017-04-08 17:33:32 +02:00
sysv
tracefs
ubifs
udf
ufs
xfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-04-09 08:26:21 -07:00
aio.c
anon_inodes.c
attr.c
bad_inode.c
binfmt_aout.c
binfmt_elf_fdpic.c
binfmt_elf.c
binfmt_em86.c
binfmt_flat.c
binfmt_misc.c
binfmt_script.c
block_dev.c
buffer.c
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c
compat.c
coredump.c
dax.c	dax: fix radix tree insertion race	2017-04-08 00:47:49 -07:00
dcache.c
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c	epoll: Add busy poll support to epoll with socket fds.	2017-03-24 20:49:31 -07:00
exec.c
fcntl.c
fhandle.c
file_table.c
file.c
filesystems.c
fs_pin.c
fs_struct.c
fs-writeback.c	writeback: fix memory leak in wb_queue_work()	2017-03-13 08:27:34 -06:00
inode.c
internal.h
ioctl.c
iomap.c	iomap: invalidate page caches should be after iomap_dio_complete() in direct write	2017-03-06 09:50:01 -08:00
Kconfig
Kconfig.binfmt
libfs.c
locks.c
Makefile
mbcache.c
mount.h
mpage.c
namei.c	vfs: don't do RCU lookup of empty pathnames	2017-04-15 09:34:52 -07:00
namespace.c
no-block.c
nsfs.c	nsfs: mark dentry with DCACHE_RCUACCESS	2017-04-19 15:56:24 -07:00
open.c
pipe.c
pnode.c
pnode.h
posix_acl.c
proc_namespace.c
read_write.c
readdir.c
select.c	net: Track start of busy loop instead of when it should end	2017-03-24 20:49:31 -07:00
seq_file.c
signalfd.c
splice.c
stack.c
stat.c	statx: Include a mask for stx_attributes in struct statx	2017-04-03 01:06:00 -04:00
statfs.c
super.c
sync.c
timerfd.c
userfaultfd.c	userfaultfd: report actual registered features in fdinfo	2017-04-08 00:47:48 -07:00
utimes.c
xattr.c