FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-27 05:32:27 +00:00
Code Issues 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
…
bfs
…
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
…
configfs
…
cramfs
…
crypto
fscrypto: require write access to mount to set encryption policy
2016-09-10 01:18:57 -04:00
debugfs
…
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
…
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
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
…
fscache
…
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
…
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
…
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
…
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
…
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: 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
…
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
sysfs: correctly handle read offset on PREALLOC attrs
2016-08-31 15:14:44 +02:00
sysv
…
tracefs
…
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
…
anon_inodes.c
…
attr.c
…
bad_inode.c
…
binfmt_aout.c
…
binfmt_elf_fdpic.c
…
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
…
compat_binfmt_elf.c
…
compat_ioctl.c
…
compat.c
…
coredump.c
…
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
…
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
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
…
locks.c
…
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
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
…
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
…
readdir.c
…
select.c
…
seq_file.c
fs/seq_file: fix out-of-bounds read
2016-08-26 17:39:35 -07:00
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
…