David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

2017-01-28 10:33:06 -05:00

..

9p

…

adfs

…

affs

…

afs

afs: Conditionalise a new unused variable

2017-01-16 13:30:52 -05:00

autofs4

…

befs

…

bfs

…

btrfs

Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

2017-01-27 12:41:46 -08:00

cachefiles

…

ceph

ceph: fix bad endianness handling in parse_reply_info_extra

2017-01-18 17:58:45 +01:00

cifs

…

coda

…

configfs

…

cramfs

…

crypto

fscrypt: fix renaming and linking special files

2016-12-31 00:47:05 -05:00

debugfs

…

devpts

…

dlm

…

ecryptfs

…

efivarfs

…

efs

…

exofs

…

exportfs

…

ext2

dax: fix build warnings with FS_DAX and !FS_IOMAP

2017-01-24 16:26:14 -08:00

ext4

dax: fix build warnings with FS_DAX and !FS_IOMAP

2017-01-24 16:26:14 -08:00

f2fs

block: Rename blk_queue_zone_size and bdev_zone_size

2017-01-12 07:58:32 -07:00

fat

…

freevxfs

…

fscache

…

fuse

fuse: fix time_to_jiffies nsec sanity check

2017-01-13 17:20:47 +01:00

gfs2

…

hfs

…

hfsplus

…

hostfs

…

hpfs

…

hugetlbfs

…

isofs

…

jbd2

…

jffs2

…

jfs

…

kernfs

…

lockd

…

minix

…

ncpfs

…

nfs

NFSv4: Fix client recovery when server reboots multiple times

2017-01-13 13:31:32 -05:00

nfs_common

…

nfsd

nfsd: fix supported attributes for acl & labels

2017-01-12 15:55:51 -05:00

nilfs2

…

nls

…

notify

Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit

2017-01-05 23:06:06 -08:00

ntfs

…

ocfs2

ocfs2: fix crash caused by stale lvb with fsdlm plugin

2017-01-10 18:31:54 -08:00

omfs

…

openpromfs

…

orangefs

…

overlayfs

ovl: fix possible use after free on redirect dir lookup

2017-01-18 15:19:54 +01:00

proc

proc: add a schedule point in proc_pid_readdir()

2017-01-24 16:26:14 -08:00

pstore

…

qnx4

…

qnx6

…

quota

…

ramfs

…

reiserfs

…

romfs

romfs: use different way to generate fsid for BLOCK or MTD

2017-01-24 16:26:14 -08:00

squashfs

…

sysfs

…

sysv

…

tracefs

…

ubifs

ubifs: Fix journal replay wrt. xattr nodes

2017-01-17 14:35:58 +01:00

udf

…

ufs

…

xfs

xfs: prevent quotacheck from overloading inode lru

2017-01-27 09:32:30 -08:00

aio.c

aio: fix lock dep warning

2017-01-14 19:31:40 -05:00

anon_inodes.c

…

attr.c

…

bad_inode.c

…

binfmt_aout.c

…

binfmt_elf_fdpic.c

…

binfmt_elf.c

coredump: Ensure proper size of sparse core files

2017-01-14 19:32:40 -05:00

binfmt_em86.c

…

binfmt_flat.c

…

binfmt_misc.c

…

binfmt_script.c

…

block_dev.c

block: fix use after free in __blkdev_direct_IO

2017-01-24 07:55:53 -07:00

buffer.c

clean_bdev_aliases: Prevent cleaning blocks that are not in block range

2017-01-02 09:35:14 -07:00

char_dev.c

…

compat_binfmt_elf.c

…

compat_ioctl.c

…

compat.c

…

coredump.c

coredump: Ensure proper size of sparse core files

2017-01-14 19:32:40 -05:00

dax.c

dax: fix build warnings with FS_DAX and !FS_IOMAP

2017-01-24 16:26:14 -08:00

dcache.c

mnt: Protect the mountpoint hashtable with mount_lock

2017-01-10 13:34:43 +13:00

dcookies.c

…

direct-io.c

do_direct_IO: Use inode->i_blkbits to compute block count to be cleaned

2017-01-10 13:29:54 -07:00

drop_caches.c

…

eventfd.c

…

eventpoll.c

…

exec.c

…

fcntl.c

…

fhandle.c

…

file_table.c

…

file.c

…

filesystems.c

…

fs_pin.c

…

fs_struct.c

…

fs-writeback.c

…

inode.c

…

internal.h

…

ioctl.c

…

iomap.c

…

Kconfig

dax: fix build warnings with FS_DAX and !FS_IOMAP

2017-01-24 16:26:14 -08:00

Kconfig.binfmt

…

libfs.c

libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount

2017-01-10 13:34:55 +13:00

locks.c

…

Makefile

…

mbcache.c

…

mount.h

…

mpage.c

…

namei.c

…

namespace.c

mnt: Protect the mountpoint hashtable with mount_lock

2017-01-10 13:34:43 +13:00

no-block.c

…

nsfs.c

…

open.c

…

pipe.c

…

pnode.c

…

pnode.h

…

posix_acl.c

tmpfs: clear S_ISGID when setting posix ACLs

2017-01-10 01:29:48 -05:00

proc_namespace.c

…

read_write.c

…

readdir.c

…

select.c

…

seq_file.c

…

signalfd.c

…

splice.c

…

stack.c

…

stat.c

…

statfs.c

…

super.c

…

sync.c

…

timerfd.c

…

userfaultfd.c

userfaultfd: fix SIGBUS resulting from false rwsem wakeups

2017-01-24 16:26:14 -08:00

utimes.c

…

xattr.c

…