openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
89982f7ccee2fcd8fea7936b81eec6defbf0f131
linux-st/fs
History
Jason Gunthorpe 89982f7cce Merge tag 'v4.18' into rdma.git for-next 
Resolve merge conflicts from the -rc cycle against the rdma.git tree:

Conflicts:
 drivers/infiniband/core/uverbs_cmd.c
  - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
  - Merge removal of file->ucontext in for-next with new code in -rc
 drivers/infiniband/core/uverbs_main.c
  - for-next removed code from ib_uverbs_write() that was modified
    in for-rc

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
2018-08-16 13:12:00 -06:00
..
9p
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
adfs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
affs
…
afs
Merge branch 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-06-16 16:32:04 +09:00
autofs
autofs: fix slab out of bounds read in getname_kernel()
2018-07-14 11:11:09 -07:00
befs
fix a series of Documentation/ broken file name references
2018-06-15 18:10:01 -03:00
bfs
…
btrfs
Merge tag 'for-4.18-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
2018-07-21 16:42:03 -07:00
cachefiles
cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
2018-07-25 14:49:00 +01:00
ceph
ceph: fix dentry leak in splice_dentry()
2018-06-26 18:42:44 +02:00
cifs
Merge tag 'v4.18' into rdma.git for-next
2018-08-16 13:12:00 -06:00
coda
vfs: change inode times to use struct timespec64
2018-06-05 16:57:31 -07:00
configfs
vfs: change inode times to use struct timespec64
2018-06-05 16:57:31 -07:00
cramfs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
crypto
Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
2018-06-11 10:16:13 -07:00
debugfs
Revert "debugfs: inode: debugfs_create_dir uses mode permission from parent"
2018-06-12 20:52:16 -07:00
devpts
…
dlm
treewide: Use array_size() in vmalloc()
2018-06-12 16:19:22 -07:00
ecryptfs
…
efivarfs
…
efs
…
exofs
exofs: avoid VLA in structures
2018-06-15 07:55:24 +09:00
exportfs
…
ext2
ext2: add warning when specifying nocheck option
2018-06-20 11:04:26 +02:00
ext4
ext4: fix check to prevent initializing reserved inodes
2018-07-29 15:34:00 -04:00
f2fs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
fat
fat: fix memory allocation failure handling of match_strdup()
2018-07-21 12:50:46 -07:00
freevxfs
…
fscache
fscache: Fix reference overput in fscache_attach_object() error handling
2018-07-25 14:49:00 +01:00
fuse
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
gfs2
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
hfs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
hfsplus
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
hostfs
vfs: change inode times to use struct timespec64
2018-06-05 16:57:31 -07:00
hpfs
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
hugetlbfs
mm: use vma_init() to initialize VMAs on stack and data segments
2018-07-26 19:38:03 -07:00
isofs
…
jbd2
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2018-07-08 11:10:30 -07:00
jffs2
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
jfs
jfs: Fix usercopy whitelist for inline inode data
2018-08-04 07:53:46 -07:00
kernfs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
lockd
…
minix
…
nfs
NFSv4: Fix _nfs4_do_setlk()
2018-08-01 23:17:06 -04:00
nfs_common
…
nfsd
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
nilfs2
…
nls
…
notify
…
ntfs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
ocfs2
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
omfs
…
openpromfs
…
orangefs
Merge tag 'docs-broken-links' of git://linuxtv.org/mchehab/experimental
2018-06-17 05:25:18 +09:00
overlayfs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
proc
fs/proc/task_mmu.c: fix Locked field in /proc/pid/smaps*
2018-07-14 11:11:09 -07:00
pstore
pstore: Remove bogus format string definition
2018-06-14 14:57:24 +02:00
qnx4
…
qnx6
…
quota
quota: Cleanup list iteration in dqcache_shrink_scan()
2018-06-20 11:04:26 +02:00
ramfs
…
reiserfs
reiserfs: fix buffer overflow with long warning messages
2018-07-14 11:11:10 -07:00
romfs
…
squashfs
Squashfs: Compute expected length from inode size rather than block length
2018-08-02 09:34:02 -07:00
sysfs
…
sysv
…
tracefs
…
ubifs
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
udf
udf: Drop unused arguments of udf_delete_aext()
2018-06-20 11:05:49 +02:00
ufs
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
xfs
xfs: properly handle free inodes in extent hint validators
2018-07-24 11:34:52 -07:00
aio.c
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-07-22 12:04:51 -07:00
anon_inodes.c
…
attr.c
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
bad_inode.c
vfs: change inode times to use struct timespec64
2018-06-05 16:57:31 -07:00
binfmt_aout.c
…
binfmt_elf_fdpic.c
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
binfmt_elf.c
fs, elf: make sure to page align bss in load_elf_library
2018-07-14 11:11:10 -07:00
binfmt_em86.c
…
binfmt_flat.c
…
binfmt_misc.c
docs: Fix more broken references
2018-06-15 18:11:26 -03:00
binfmt_script.c
…
block_dev.c
Merge tag 'for-linus-20180727' of git://git.kernel.dk/linux-block
2018-07-27 12:51:00 -07:00
buffer.c
…
char_dev.c
…
compat_binfmt_elf.c
…
compat_ioctl.c
autofs: clean up includes
2018-06-07 17:34:40 -07:00
compat.c
ncpfs: remove compat functionality
2018-06-05 19:23:26 +02:00
coredump.c
…
d_path.c
…
dax.c
Merge tag 'libnvdimm-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2018-06-08 17:21:52 -07:00
dcache.c
make sure that __dentry_kill() always invalidates d_seq, unhashed or not
2018-08-09 18:07:15 -04:00
dcookies.c
…
direct-io.c
…
drop_caches.c
…
eventfd.c
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
eventpoll.c
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
exec.c
mm: fix vma_is_anonymous() false-positives
2018-07-26 19:38:03 -07:00
fcntl.c
mm: restructure memfd code
2018-06-07 17:34:35 -07:00
fhandle.c
…
file_table.c
…
file.c
…
filesystems.c
…
fs_pin.c
…
fs_struct.c
…
fs-writeback.c
…
inode.c
Fix up non-directory creation in SGID directories
2018-07-05 12:36:36 -07:00
internal.h
drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open()
2018-07-10 23:29:03 -04:00
ioctl.c
…
iomap.c
fs: fix iomap_bmap position calculation
2018-08-02 13:09:27 -07:00
Kconfig
autofs: remove left-over autofs4 stubs
2018-06-11 08:22:34 -07:00
Kconfig.binfmt
docs: Fix more broken references
2018-06-15 18:11:26 -03:00
libfs.c
…
locks.c
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
2018-06-15 07:31:07 +09:00
Makefile
autofs: remove left-over autofs4 stubs
2018-06-11 08:22:34 -07:00
mbcache.c
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
mount.h
…
mpage.c
…
namei.c
Merge branch 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-06-16 16:32:04 +09:00
namespace.c
fix __legitimize_mnt()/mntput() race
2018-08-09 17:51:32 -04:00
no-block.c
…
nsfs.c
…
open.c
…
pipe.c
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
pnode.c
…
pnode.h
…
posix_acl.c
…
proc_namespace.c
…
read_write.c
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
readdir.c
…
select.c
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
seq_file.c
…
signalfd.c
Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-06-16 16:21:50 +09:00
splice.c
Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-06-16 16:21:50 +09:00
stack.c
…
stat.c
…
statfs.c
…
super.c
…
sync.c
…
timerfd.c
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
userfaultfd.c
userfaultfd: remove uffd flags from vma->vm_flags if UFFD_EVENT_FORK fails
2018-08-02 16:03:40 -07:00
utimes.c
…
xattr.c
…