iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs
History
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-09-12 15:52:44 -07: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: Rewrite the data and ack handling code
2016-09-08 11:10:12 +01: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
fs/befs/io.c:befs_bread(): remove unneeded initialization to NULL
2016-05-23 17:04:14 -07:00
bfs
more trivial ->iterate_shared conversions
2016-05-09 11:41:14 -04:00
btrfs
Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2016-09-09 12:52:31 -07:00
cachefiles
cachefiles: Fix race between inactivating and culling a cache object
2016-08-03 13:33:26 -04:00
ceph
ceph: do not modify fi->frag in need_reset_readdir()
2016-09-05 14:30:35 +02:00
cifs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
coda
drop redundant ->owner initializations
2016-05-29 19:08:00 -04:00
configfs
configfs: don't set buffer_needs_fill to zero if show() returns error
2016-07-10 21:02:18 +09:00
cramfs
more trivial ->iterate_shared conversions
2016-05-09 11:41:14 -04:00
crypto
fscrypto: require write access to mount to set encryption policy
2016-09-10 01:18:57 -04:00
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
devpts: return NULL pts 'priv' entry for non-devpts nodes
2016-09-03 11:02:50 -07:00
dlm
dlm: fix malfunction of dlm_tool caused by debugfs changes
2016-08-26 13:22:14 -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
fs/efs/super.c: fix return value
2016-05-20 17:58:30 -07:00
exofs
block, fs, mm, drivers: use bio set/get op accessors
2016-06-07 13:41:38 -06:00
exportfs
introduce a parallel variant of ->iterate()
2016-05-02 19:49:29 -04:00
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
fscrypto: require write access to mount to set encryption policy
2016-09-10 01:18:57 -04:00
f2fs
fscrypto: require write access to mount to set encryption policy
2016-09-10 01:18:57 -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
freevxfs: update Kconfig information
2016-06-13 10:20:39 +02:00
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
fuse: direct-io: don't dirty ITER_BVEC pages
2016-08-24 18:17:04 +02: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
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
isofs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
jbd2
The major change this cycle is deleting ext4's copy of the file system
2016-07-26 18:35:55 -07:00
jffs2
vfs: make the string hashes salt the hash
2016-06-10 20:21:46 -07:00
jfs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
kernfs
kernfs: don't depend on d_find_any_alias() when generating notifications
2016-08-31 14:48:52 +02: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
simple local filesystems: switch to ->iterate_shared()
2016-05-02 19:49:32 -04:00
ncpfs
get rid of 'parent' argument of ->d_compare()
2016-07-31 16:37:25 -04:00
nfs
NFSv4.x: Fix a refcount leak in nfs_callback_up_net
2016-08-30 09:26:57 -04:00
nfs_common
lockd: NLM grace period shouldn't block NFSv4 opens
2015-08-13 10:22:06 -04:00
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
fsnotify: avoid spurious EMFILE errors from inotify_init()
2016-05-19 19:12:14 -07:00
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
more trivial ->iterate_shared conversions
2016-05-09 11:41:14 -04:00
openpromfs
more trivial ->iterate_shared conversions
2016-05-09 11:41:14 -04:00
orangefs
orangefs: Account for jiffies wraparound.
2016-08-02 15:39:13 -04:00
overlayfs
ovl: fix workdir creation
2016-09-05 13:55:20 +02:00
proc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-09-12 15:52:44 -07:00
pstore
ramoops: use persistent_ram_free() instead of kfree() for freeing prz
2016-08-05 11:21:46 -07:00
qnx4
more trivial ->iterate_shared conversions
2016-05-09 11:41:14 -04:00
qnx6
more trivial ->iterate_shared conversions
2016-05-09 11:41:14 -04:00
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
tmpfs/ramfs: fix VM_MAYSHARE mappings for NOMMU
2016-05-20 17:58:30 -07:00
reiserfs
reiserfs: fix "new_insert_key may be used uninitialized ..."
2016-08-02 19:35:22 -04:00
romfs
romfs, squashfs: switch to ->iterate_shared()
2016-05-09 11:41:15 -04:00
squashfs
fs: have ll_rw_block users pass in op and flags separately
2016-06-07 13:41:38 -06:00
sysfs
sysfs: correctly handle read offset on PREALLOC attrs
2016-08-31 15:14:44 +02:00
sysv
vfs: make the string hashes salt the hash
2016-06-10 20:21:46 -07:00
tracefs
tracefs: ->d_parent is never NULL or negative...
2016-05-29 16:22:07 -04:00
ubifs
ubifs: Fix xattr generic handler usage
2016-08-23 23:02:52 +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
xfs: track log done items directly in the deferred pending work item
2016-08-30 13:51:39 +10:00
aio.c
aio: make aio_setup_ring killable
2016-05-23 17:04:14 -07:00
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
switch ->setxattr() to passing dentry and inode separately
2016-05-27 20:09:16 -04:00
binfmt_aout.c
fs: fix binfmt_aout.c build error
2016-05-28 16:34:59 -07:00
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: switch to new creds when switching to new mm
2016-08-31 09:13:56 -07: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
binfmt_misc for-linus on 20160727
2016-08-07 10:13:14 -04:00
binfmt_script.c
…
block_dev.c
fs/block_dev: fix potential NULL ptr deref in freeze_bdev()
2016-08-25 08:38:26 -06:00
buffer.c
xfs: update for 4.8-rc1
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
Fix a number of bugs, most notably a potential stale data exposure
2016-05-24 12:55:26 -07:00
coredump.c
coredump: fix dumping through pipes
2016-06-07 22:07:09 -04:00
dax.c
libnvdimm for 4.8
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
direct-io: use bio set/get op accessors
2016-06-07 13:41:38 -06:00
drop_caches.c
inode: convert inode_sb_list_lock to per-sb
2015-08-17 18:39:46 -04:00
eventfd.c
eventfd: document lockless access in eventfd_poll
2016-03-22 15:36:02 -07:00
eventpoll.c
fs: poll/select/recvmmsg: use timespec64 for timeout events
2016-05-19 19:12:14 -07:00
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
fcntl: allow to set O_DIRECT flag on pipe
2016-01-09 02:55:37 -05:00
fhandle.c
fs/coredump: prevent fsuid=0 dumps into user-controlled directories
2016-03-22 15:36:02 -07:00
file_table.c
fs, file table: reinit files_stat.max_files after deferred memory initialisation
2015-08-07 04:39:40 +03:00
file.c
give readdir(2)/getdents(2)/etc. uniform exclusion with lseek()
2016-05-02 19:49:28 -04:00
filesystems.c
find_filesystem(): simplify comparison
2016-01-19 12:02:23 -05:00
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
binfmt_misc for-linus on 20160727
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
iomap: don't set FIEMAP_EXTENT_MERGED for extent based filesystems
2016-08-29 11:33:58 +10:00
Kconfig
Highlights:
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
lockless next_positive()
2016-06-20 17:11:29 -04:00
locks.c
locks: use file_inode()
2016-07-01 10:24:18 -04:00
Makefile
fs: introduce iomap infrastructure
2016-06-21 09:23:11 +10:00
mbcache.c
mbcache: add reusable flag to cache entries
2016-02-22 22:44:04 -05:00
mount.h
fs: use seq_open_private() for proc_mounts
2015-06-30 19:44:56 -07:00
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
fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
2015-09-11 15:21:34 -07:00
open.c
binfmt_misc for-linus on 20160727
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
propogate_mnt: Handle the first propogated copy being a slave
2016-05-05 09:54:45 -05:00
pnode.h
mnt: Clarify and correct the disconnect logic in umount_tree
2015-07-22 20:33:27 -05:00
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
vfs: show_vfsstat: do not ignore errors from show_devname method
2016-03-16 13:09:08 -04:00
read_write.c
x86/syscalls: Add compat_sys_preadv64v2/compat_sys_pwritev64v2
2016-07-15 10:30:26 +02:00
readdir.c
restore killability of old mutex_lock_killable(&inode->i_mutex) users
2016-05-26 00:13:25 -04:00
select.c
fs: poll/select/recvmmsg: use timespec64 for timeout events
2016-05-19 19:12:14 -07:00
seq_file.c
fs/seq_file: fix out-of-bounds read
2016-08-26 17:39:35 -07:00
signalfd.c
signalfd: fix information leak in signalfd_copyinfo
2015-08-07 04:39:40 +03:00
splice.c
Merge branch 'ovl-fixes' into for-linus
2016-05-11 00:00:29 -04:00
stack.c
…
stat.c
fs/stat.c: drop the last new_valid_dev check
2016-01-16 11:17:23 -08:00
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
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
timerfd.c
timerfd: Reject ALARM timerfds without CAP_WAKE_ALARM
2016-06-09 23:42:38 +02:00
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