David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
9p
adfs
affs	fs/affs: add rename exchange	2017-05-05 15:24:52 -04:00
afs	rxrpc: Provide a cmsg to specify the amount of Tx data for a call	2017-06-07 17:15:46 +01:00
autofs4
befs	befs: make export work with cold dcache	2017-05-05 11:35:35 +01:00
bfs	Tigran has moved	2017-05-12 15:57:15 -07:00
btrfs	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2017-06-15 17:54:51 +09:00
cachefiles
ceph	ceph: check that the new inode size is within limits in ceph_fallocate()	2017-05-24 18:10:54 +02:00
cifs	[CIFS] Minor cleanup of xattr query function	2017-05-12 20:59:10 -05:00
coda
configfs
cramfs
crypto	fscrypt: introduce helper function for filename matching	2017-05-04 11:44:37 -04:00
debugfs	fs: constify tree_descr arrays passed to simple_fill_super()	2017-04-26 23:54:06 -04:00
devpts
dlm
ecryptfs
efivarfs
efs
exofs	fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag	2017-05-08 17:15:14 -07:00
exportfs
ext2	dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case	2017-05-13 17:52:16 -07:00
ext4	ext4: fix fdatasync(2) after extent manipulation operations	2017-05-29 13:24:55 -04:00
f2fs	crypto: Work around deallocated stack frame reference gcc bug on sparc.	2017-06-08 17:36:03 +08:00
fat
freevxfs
fscache
fuse	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2017-05-20 16:12:30 -07:00
gfs2	gfs2: Make flush bios explicitely sync	2017-05-24 13:35:20 +02:00
hfs	fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag	2017-05-08 17:15:14 -07:00
hfsplus	fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag	2017-05-08 17:15:14 -07:00
hostfs
hpfs
hugetlbfs
isofs
jbd2	jbd2: preserve original nofs flag during journal restart	2017-05-21 22:32:23 -04:00
jffs2
jfs
kernfs
lockd	Another RDMA update from Chuck Lever, and a bunch of miscellaneous	2017-05-10 13:29:23 -07:00
minix
ncpfs
nfs	NFS client bugfixes for Linux 4.12	2017-06-04 11:56:53 -07:00
nfs_common
nfsd	nfsd4: fix null dereference on replay	2017-05-23 14:20:58 -04:00
nilfs2
nls
notify
ntfs	ntfs: Use ERR_CAST() to avoid cross-structure cast	2017-05-28 10:11:48 -07:00
ocfs2	ocfs2: Use ERR_CAST() to avoid cross-structure cast	2017-05-28 10:11:49 -07:00
omfs
openpromfs
orangefs	Some cleanups:	2017-05-05 13:36:10 -07:00
overlayfs	ovl: filter trusted xattr for non-admin	2017-05-29 15:15:27 +02:00
proc	"Yes, people use FOLL_FORCE ;)"	2017-05-30 12:38:59 -07:00
pstore	Annotation of module parameters that specify device settings	2017-05-10 19:13:03 -07:00
qnx4
qnx6
quota	ext4: fix quota charging for shared xattr blocks	2017-05-24 18:24:07 -04:00
ramfs
reiserfs	reiserfs: Make flush bios explicitely sync	2017-05-24 13:35:20 +02:00
romfs
squashfs
sysfs
sysv
tracefs	fs: constify tree_descr arrays passed to simple_fill_super()	2017-04-26 23:54:06 -04:00
ubifs	This pull request contains updates for both UBI and UBIFS:	2017-05-13 10:23:12 -07:00
udf
ufs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-06-10 11:09:23 -07:00
xfs	Changes since last update:	2017-06-02 12:29:03 -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	fs: constify tree_descr arrays passed to simple_fill_super()	2017-04-26 23:54:06 -04:00
binfmt_script.c
block_dev.c	Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm	2017-05-12 15:43:10 -07:00
buffer.c	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-09 09:12:53 -07:00
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c	fs: compat: Remove warning from COMPATIBLE_IOCTL	2017-04-29 17:47:19 -04:00
compat.c
coredump.c
dax.c	dax: fix race between colliding PMD & PTE entries	2017-06-02 15:07:37 -07:00
dcache.c	fs: don't set *REFERENCED on single use objects	2017-05-03 11:47:05 -04:00
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c
exec.c
fcntl.c	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-09 09:12:53 -07:00
fhandle.c
file_table.c
file.c	mm, vmalloc: use __GFP_HIGHMEM implicitly	2017-05-08 17:15:13 -07:00
filesystems.c
fs_pin.c
fs_struct.c
fs-writeback.c
inode.c	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-09 09:12:53 -07:00
internal.h	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-09 09:12:53 -07:00
ioctl.c
iomap.c	fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag	2017-05-08 17:15:14 -07:00
Kconfig	block, dax: move "select DAX" from BLOCK to FS_DAX	2017-05-08 10:55:27 -07:00
Kconfig.binfmt
libfs.c	fs: constify tree_descr arrays passed to simple_fill_super()	2017-04-26 23:54:06 -04:00
locks.c
Makefile
mbcache.c
mount.h
mpage.c
namei.c	Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-12 11:39:59 -07:00
namespace.c	Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-12 11:39:59 -07:00
no-block.c
nsfs.c	ns: allow ns_entries to have custom symlink content	2017-05-08 17:15:12 -07:00
open.c	Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-12 11:39:59 -07:00
pipe.c
pnode.c
pnode.h
posix_acl.c
proc_namespace.c
read_write.c
readdir.c
select.c	treewide: use kv[mz]alloc* rather than opencoded variants	2017-05-08 17:15:13 -07:00
seq_file.c	mm: introduce kv[mz]alloc helpers	2017-05-08 17:15:12 -07:00
signalfd.c
splice.c	Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-02 11:38:06 -07:00
stack.c
stat.c	ufs: restore maintaining ->i_blocks	2017-06-09 16:28:01 -04:00
statfs.c
super.c
sync.c
timerfd.c
userfaultfd.c
utimes.c
xattr.c	treewide: use kv[mz]alloc* rather than opencoded variants	2017-05-08 17:15:13 -07:00