averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-01-15 12:25:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
18bfeba50dfd0c8ee420396f2570f16a0bdbd7de
linux-stable-mirror/fs
History
David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-08-18 01:17:32 -04:00
..
9p
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-07 10:01:14 -04:00
adfs
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-07 10:01:14 -04:00
affs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
afs
rxrpc: Fix races between skb free, ACK generation and replying
2016-08-06 00:08:40 -04:00
autofs4
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-06 09:49:02 -04:00
befs
…
bfs
…
btrfs
Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2016-08-10 11:16:03 -07:00
cachefiles
cachefiles: Fix race between inactivating and culling a cache object
2016-08-03 13:33:26 -04:00
ceph
ceph: initialize pathbase in the !dentry case in encode_caps_cb()
2016-08-09 17:26:56 +02:00
cifs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
coda
…
configfs
configfs: don't set buffer_needs_fill to zero if show() returns error
2016-07-10 21:02:18 +09:00
cramfs
…
crypto
…
debugfs
Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into work.misc
2016-06-30 23:34:49 -04:00
devpts
userns: Remove the now unnecessary FS_USERNS_DEV_MOUNT flag
2016-06-23 15:47:31 -05:00
dlm
dlm: Use kmemdup instead of kmalloc and memcpy
2016-06-23 11:55:58 -05:00
ecryptfs
ecryptfs: don't allow mmap when the lower fs doesn't support it
2016-07-08 10:35:28 -05:00
efivarfs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
efs
…
exofs
…
exportfs
…
ext2
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-06 09:49:02 -04:00
ext4
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-07-28 12:59:05 -07:00
f2fs
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-06 09:49:02 -04:00
fat
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-07 10:01:14 -04:00
freevxfs
…
fscache
Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into work.misc
2016-06-30 23:34:49 -04:00
fuse
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-06 09:49:02 -04:00
gfs2
fs: return EPERM on immutable inode
2016-08-07 10:03:31 -04:00
hfs
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-07 10:01:14 -04:00
hfsplus
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-07 10:01:14 -04:00
hostfs
hostfs: Freeing an ERR_PTR in hostfs_fill_sb_common()
2016-08-04 00:18:10 +02:00
hpfs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
hugetlbfs
…
isofs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
jbd2
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2016-07-26 18:35:55 -07:00
jffs2
…
jfs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
kernfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-07-29 15:54:19 -07:00
lockd
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-07-28 12:59:05 -07:00
logfs
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-06 09:49:02 -04:00
minix
…
ncpfs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
nfs
Merge tag 'nfs-for-4.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
2016-08-12 12:32:24 -07:00
nfs_common
…
nfsd
nfsd: don't return an unhashed lock stateid after taking mutex
2016-08-12 16:10:25 -04:00
nilfs2
nilfs2: move ioctl interface and disk layout to uapi separately
2016-08-02 19:35:21 -04:00
nls
…
notify
…
ntfs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-07-28 12:59:05 -07:00
ocfs2
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-06 09:49:02 -04:00
omfs
…
openpromfs
…
orangefs
orangefs: Account for jiffies wraparound.
2016-08-02 15:39:13 -04:00
overlayfs
ovl: simplify empty checking
2016-07-29 12:05:25 +02:00
proc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-08-18 01:17:32 -04:00
pstore
ramoops: use persistent_ram_free() instead of kfree() for freeing prz
2016-08-05 11:21:46 -07:00
qnx4
…
qnx6
…
quota
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-07-29 15:54:19 -07:00
ramfs
…
reiserfs
reiserfs: fix "new_insert_key may be used uninitialized ..."
2016-08-02 19:35:22 -04:00
romfs
…
squashfs
…
sysfs
kernfs: The cgroup filesystem also benefits from SB_I_NOEXEC
2016-06-23 15:41:56 -05:00
sysv
…
tracefs
…
ubifs
ubifs: switch_gc_head: Remove redondant sync of wbuf
2016-07-29 23:32:37 +02:00
udf
Merge branch 'for-4.8/drivers' of git://git.kernel.dk/linux-block
2016-07-26 15:37:51 -07:00
ufs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-07-28 12:59:05 -07:00
xfs
fs: return EPERM on immutable inode
2016-08-07 10:03:31 -04:00
aio.c
…
anon_inodes.c
…
attr.c
vfs: Don't modify inodes with a uid or gid unknown to the vfs
2016-07-05 15:06:46 -05:00
bad_inode.c
…
binfmt_aout.c
…
binfmt_elf_fdpic.c
elf_fdpic_transfer_args_to_stack(): make it generic
2016-07-25 16:51:49 +10:00
binfmt_elf.c
binfmt_elf: fix calculations for bss padding
2016-08-02 19:35:14 -04:00
binfmt_em86.c
fs/binfmt_em86.c: fix incompatible pointer type
2016-08-02 19:35:15 -04:00
binfmt_flat.c
binfmt_flat: allow compressed flat binary format to work on MMU systems
2016-07-28 13:29:12 +10:00
binfmt_misc.c
Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc
2016-08-07 10:13:14 -04:00
binfmt_script.c
…
block_dev.c
block/mm: make bdev_ops->rw_page() take a bool for read/write
2016-08-07 14:41:02 -06:00
buffer.c
Merge tag 'xfs-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs
2016-07-27 09:53:35 -07:00
char_dev.c
chardev: add missing line break in pr_warn
2016-07-14 16:21:53 +09:00
compat_binfmt_elf.c
…
compat_ioctl.c
[media] cec: add compat32 ioctl support
2016-06-28 10:00:13 -03:00
compat.c
…
coredump.c
…
dax.c
Merge tag 'libnvdimm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2016-07-28 17:38:16 -07:00
dcache.c
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-07 10:01:14 -04:00
dcookies.c
…
direct-io.c
…
drop_caches.c
…
eventfd.c
…
eventpoll.c
…
exec.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2016-08-04 18:04:44 -04:00
fcntl.c
…
fhandle.c
…
file_table.c
…
file.c
…
filesystems.c
…
fs_pin.c
…
fs_struct.c
…
fs-writeback.c
mm, writeback: flush plugged IO in wakeup_flusher_threads()
2016-08-09 19:58:06 -06:00
inode.c
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-08-07 10:01:14 -04:00
internal.h
Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc
2016-08-07 10:13:14 -04:00
ioctl.c
vfs: ioctl: prevent double-fetch in dedupe ioctl
2016-07-28 15:23:12 -07:00
iomap.c
fs: iomap based fiemap implementation
2016-06-21 09:38:45 +10:00
Kconfig
Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux
2016-08-04 19:59:06 -04:00
Kconfig.binfmt
m68k: enable binfmt_flat on systems with an MMU
2016-07-28 13:29:13 +10:00
libfs.c
…
locks.c
locks: use file_inode()
2016-07-01 10:24:18 -04:00
Makefile
…
mbcache.c
…
mount.h
…
mpage.c
block/mm: make bdev_ops->rw_page() take a bool for read/write
2016-08-07 14:41:02 -06:00
namei.c
fs: return EPERM on immutable inode
2016-08-07 10:03:31 -04:00
namespace.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-07-29 15:54:19 -07:00
no-block.c
…
nsfs.c
…
open.c
Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc
2016-08-07 10:13:14 -04:00
pipe.c
mm: memcontrol: only mark charged pages with PageKmemcg
2016-08-09 10:14:10 -07:00
pnode.c
…
pnode.h
…
posix_acl.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-07-29 15:54:19 -07:00
proc_namespace.c
…
read_write.c
x86/syscalls: Add compat_sys_preadv64v2/compat_sys_pwritev64v2
2016-07-15 10:30:26 +02:00
readdir.c
…
select.c
…
seq_file.c
…
signalfd.c
…
splice.c
…
stack.c
…
stat.c
…
statfs.c
…
super.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-07-29 15:54:19 -07:00
sync.c
…
timerfd.c
…
userfaultfd.c
mm: introduce fault_env
2016-07-26 16:19:19 -07:00
utimes.c
fs: return EPERM on immutable inode
2016-08-07 10:03:31 -04:00
xattr.c
vfs: Don't modify inodes with a uid or gid unknown to the vfs
2016-07-05 15:06:46 -05:00