David S. Miller 5ca114400d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in 'net'. The esp{4,6}_offload.c conflicts were overlapping changes. The 'out' label is removed so we just return ERR_PTR(-EINVAL) directly. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-23 13:51:56 -05:00
..
9p	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
adfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
affs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
afs	afs: Fix missing error handling in afs_write_end()	2018-01-02 10:02:19 +00:00
autofs4	autofs: fix careless error in recent commit	2017-12-14 16:00:48 -08:00
befs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
bfs
btrfs	error-injection: Add injectable error types	2018-01-12 17:33:38 -08:00
cachefiles
ceph	ceph: drop negative child dentries before try pruning inode's alias	2017-12-08 11:07:12 +01:00
cifs	CIFS: don't log STATUS_NOT_FOUND errors for DFS	2017-12-06 12:48:01 -06:00
coda	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
configfs
cramfs	cramfs: fix MTD dependency	2017-12-17 12:20:58 -08:00
crypto
debugfs
devpts
dlm
ecryptfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
efivarfs
efs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
exofs
exportfs
ext2	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
ext4	ext4: fix crash when a directory's i_size is too small	2017-12-11 15:00:57 -05:00
f2fs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
fat	fs/fat/inode.c: fix sb_rdonly() change	2017-11-29 18:40:43 -08:00
freevxfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
fscache
fuse	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
gfs2	rhashtable: Change rhashtable_walk_start to return void	2017-12-11 09:58:38 -05:00
hfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
hfsplus	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
hostfs
hpfs	hpfs: don't bother with the i_version counter or f_version	2017-12-10 12:58:18 -08:00
hugetlbfs	fs/hugetlbfs/inode.c: change put_page/unlock_page order in hugetlbfs_fallocate()	2017-11-29 18:40:43 -08:00
isofs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
jbd2
jffs2	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
jfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
kernfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
lockd	nlm_shutdown_hosts_net() cleanup	2017-11-27 16:45:11 -05:00
minix	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
ncpfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
nfs	NFS client fixes for Linux 4.15-rc4	2017-12-16 13:12:53 -08:00
nfs_common	lockd: fix "list_add double add" caused by legacy signal interface	2017-11-27 16:45:11 -05:00
nfsd	nfsd: auth: Fix gid sorting when rootsquash enabled	2018-01-22 20:13:07 -08:00
nilfs2	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
nls
notify	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
ntfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
ocfs2	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
omfs
openpromfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
orangefs	orangefs: initialize op on loop restart in orangefs_devreq_read	2018-01-22 13:51:14 -08:00
overlayfs	ovl: fix overlay: warning prefix	2017-12-14 11:14:52 +01:00
proc	proc: fix coredump vs read /proc/*/stat race	2018-01-19 10:09:41 -08:00
pstore	treewide: Switch DEFINE_TIMER callbacks to struct timer_list *	2017-11-21 15:57:05 -08:00
qnx4	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
qnx6	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
quota	quota: Check for register_shrinker() failure.	2017-11-29 16:46:48 +01:00
ramfs
reiserfs	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	2017-11-30 18:38:47 -05:00
romfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
squashfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
sysfs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
sysv	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
tracefs
ubifs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
udf	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
ufs	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
xfs	Changes since last update:	2018-01-05 12:59:32 -08: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	Revert "mm: replace p??_write with pte_access_permitted in fault + gup paths"	2017-12-15 18:53:22 -08:00
dcache.c
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c	Merge branch 'akpm' (patches from Andrew)	2017-11-17 16:56:17 -08:00
exec.c	exec: Weaken dumpability for secureexec	2018-01-03 10:13:36 -08:00
fcntl.c
fhandle.c
file_table.c
file.c
filesystems.c
fs_pin.c
fs_struct.c
fs-writeback.c	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
inode.c	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
internal.h
ioctl.c
iomap.c
Kconfig
Kconfig.binfmt
libfs.c	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
locks.c	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
Makefile
mbcache.c	fs/mbcache.c: make count_objects() more robust	2017-11-29 18:40:43 -08:00
mount.h
mpage.c
namei.c	autofs: revert "autofs: fix AT_NO_AUTOMOUNT not being honored"	2017-11-29 18:40:43 -08:00
namespace.c	VFS: Handle lazytime in do_mount()	2017-12-09 20:16:33 -05:00
no-block.c
nsfs.c	nsfs: generalize ns_get_path() for path resolution with a task	2017-12-31 16:12:23 +01:00
open.c
pipe.c	pipe: add proc_dopipe_max_size() to safely assign pipe_max_size	2017-11-17 16:10:03 -08:00
pnode.c
pnode.h
posix_acl.c
proc_namespace.c	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
read_write.c
readdir.c
select.c
seq_file.c
signalfd.c
splice.c
stack.c
stat.c
statfs.c	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
super.c	sget(): handle failures of register_shrinker()	2017-12-18 15:05:07 -05:00
sync.c
timerfd.c
userfaultfd.c	userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails	2018-01-04 16:45:09 -08:00
utimes.c
xattr.c