David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

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

2018-03-06 01:20:46 -05:00

..

9p

…

adfs

…

affs

iversion: Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}

2018-02-01 08:15:25 -05:00

afs

afs: Support the AFS dynamic root

2018-02-06 14:43:37 +00:00

autofs4

Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2018-01-30 14:43:12 -08:00

befs

…

bfs

…

btrfs

Merge tag 'for-4.16-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

2018-03-04 11:04:27 -08:00

cachefiles

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

ceph

ceph: fix potential memory leak in init_caches()

2018-03-01 16:39:47 +01:00

cifs

Add missing structs and defines from recent SMB3.1.1 documentation

2018-02-07 09:36:46 -06:00

coda

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

configfs

…

cramfs

cramfs: better MTD dependency expression

2018-02-08 11:37:31 -08:00

crypto

fscrypt: fix build with pre-4.6 gcc versions

2018-02-01 10:51:18 -05:00

debugfs

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

devpts

devpts: fix error handling in devpts_mntget()

2018-01-31 08:48:37 -08:00

dlm

net: make getname() functions return length rather than use int* parameter

2018-02-12 14:15:04 -05:00

ecryptfs

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

efivarfs

efivarfs: Limit the rate for non-root to read files

2018-02-22 10:21:02 -08:00

efs

…

exofs

Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux

2018-02-07 14:25:22 -08:00

exportfs

…

ext2

Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux

2018-02-07 14:25:22 -08:00

ext4

Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux

2018-02-07 14:25:22 -08:00

f2fs

Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt

2018-02-04 10:43:12 -08:00

fat

iversion: Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}

2018-02-01 08:15:25 -05:00

freevxfs

…

fscache

…

fuse

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

gfs2

gfs2: Fixes to "Implement iomap for block_map"

2018-02-13 13:38:10 -07:00

hfs

…

hfsplus

hfsplus: honor setgid flag on directories

2018-02-06 18:32:45 -08:00

hostfs

…

hpfs

…

hugetlbfs

hugetlb: implement memfd sealing

2018-01-31 17:18:39 -08:00

isofs

…

jbd2

…

jffs2

Merge tag 'docs-4.16' of git://git.lwn.net/linux

2018-01-31 19:25:25 -08:00

jfs

Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

2018-02-03 16:25:42 -08:00

kernfs

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

lockd

net: Convert simple pernet_operations

2018-02-27 11:01:35 -05:00

minix

…

nfs

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

2018-03-06 01:20:46 -05:00

nfs_common

net: Convert simple pernet_operations

2018-02-27 11:01:35 -05:00

nfsd

Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux

2018-02-08 15:18:32 -08:00

nilfs2

nilfs2: use time64_t internally

2018-02-06 18:32:45 -08:00

nls

…

notify

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

ntfs

…

ocfs2

net: make getname() functions return length rather than use int* parameter

2018-02-12 14:15:04 -05:00

omfs

…

openpromfs

…

orangefs

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

overlayfs

ovl: check ERR_PTR() return value from ovl_encode_fh()

2018-02-05 09:50:29 +01:00

proc

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

2018-02-19 18:46:11 -05:00

pstore

…

qnx4

…

qnx6

…

quota

…

ramfs

…

reiserfs

…

romfs

…

squashfs

…

sysfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

2018-02-01 13:36:15 -08:00

sysv

…

tracefs

…

ubifs

Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt

2018-02-04 10:43:12 -08:00

udf

…

ufs

Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux

2018-02-07 14:25:22 -08:00

xfs

xfs: fix potential memory leak in mount option parsing

2018-02-26 10:02:13 -08:00

aio.c

…

anon_inodes.c

…

attr.c

…

bad_inode.c

…

binfmt_aout.c

…

binfmt_elf_fdpic.c

…

binfmt_elf.c

elf: fix NT_FILE integer overflow

2018-02-06 18:32:45 -08:00

binfmt_em86.c

…

binfmt_flat.c

…

binfmt_misc.c

…

binfmt_script.c

…

block_dev.c

blockdev: Avoid two active bdev inodes for one device

2018-02-26 09:48:42 -07:00

buffer.c

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-01-31 09:25:20 -08:00

char_dev.c

…

compat_binfmt_elf.c

…

compat_ioctl.c

…

compat.c

…

coredump.c

…

dax.c

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2018-02-03 13:49:22 -08:00

dcache.c

Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

2018-02-05 13:05:20 -08:00

dcookies.c

…

direct-io.c

direct-io: Fix sleep in atomic due to sync AIO

2018-02-26 09:05:35 -07:00

drop_caches.c

…

eventfd.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

eventpoll.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

exec.c

…

fcntl.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

fhandle.c

…

file_table.c

…

file.c

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-01-31 09:25:20 -08:00

filesystems.c

…

fs_pin.c

…

fs_struct.c

…

fs-writeback.c

…

inode.c

vfs: remove might_sleep() from clear_inode()

2018-02-06 18:32:47 -08:00

internal.h

…

ioctl.c

…

iomap.c

iomap: warn on zero-length mappings

2018-01-29 07:27:24 -08:00

Kconfig

Merge tag 'libnvdimm-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2018-02-06 10:41:33 -08:00

Kconfig.binfmt

…

libfs.c

…

locks.c

Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux

2018-02-08 15:18:32 -08:00

Makefile

…

mbcache.c

…

mount.h

…

mpage.c

…

namei.c

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-01-31 09:25:20 -08:00

namespace.c

…

no-block.c

…

nsfs.c

net: Export open_related_ns()

2018-02-15 15:34:42 -05:00

open.c

…

pipe.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

pnode.c

…

pnode.h

…

posix_acl.c

…

proc_namespace.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

read_write.c

…

readdir.c

…

select.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

seq_file.c

…

signalfd.c

fs/signalfd: fix build error for BUS_MCEERR_AR

2018-02-22 15:00:07 -06:00

splice.c

…

stack.c

…

stat.c

…

statfs.c

…

super.c

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-01-31 09:25:20 -08:00

sync.c

…

timerfd.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

userfaultfd.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

utimes.c

…

xattr.c

…