Greg Kroah-Hartman 2c136de302 Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline ... Steps along the way to 5.9-rc1 Fixed conflicts in: drivers/scsi/ufs/Kconfig drivers/scsi/ufs/ufshcd-crypto.c drivers/scsi/ufs/ufshcd.h drivers/staging/android/ion/ion.c drivers/staging/android/ion/ion_heap.c include/linux/ion.h Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ia2602190d5960b7ad1beaf49a00489d49f144a4e		2020-08-07 16:19:28 +02:00
..
9p	Merge 7e63420847 ("Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline	2020-04-09 12:54:31 +02:00
adfs	block: move struct block_device to blk_types.h	2020-06-24 09:16:02 -06:00
affs	block: move block-related definitions out of fs.h	2020-06-24 09:16:02 -06:00
afs	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
autofs	autofs: switch to kernel_write	2020-07-08 08:27:56 +02:00
befs	block: move struct block_device to blk_types.h	2020-06-24 09:16:02 -06:00
bfs	docs: filesystems: fix renamed references	2020-04-20 15:45:22 -06:00
btrfs	Merge b34133fec8 ("Merge tag 'perf-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2020-08-06 20:25:54 +02:00
cachefiles	cachefiles: switch to kernel_write	2020-07-08 08:27:56 +02:00
ceph	Merge ad57a1022f ("Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline	2020-06-24 17:54:12 +02:00
cifs	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
coda	docs: filesystems: convert coda.txt to ReST	2020-05-05 09:22:21 -06:00
configfs	A fair amount of stuff this time around, dominated by yet another massive	2020-06-01 15:45:27 -07:00
cramfs	docs: filesystems: fix renamed references	2020-04-20 15:45:22 -06:00
crypto	Merge commit 382625d0d4 ("Merge tag 'for-5.9/block-20200802' of git://git.kernel.dk/linux-block") into android-mainline	2020-08-06 10:07:17 -07:00
debugfs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-08-05 20:13:21 -07:00
devpts
dlm	dlm for 5.9	2020-08-06 19:44:25 -07:00
ecryptfs	Merge 062ea674ae ("Merge branch 'uaccess.__copy_to_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline	2020-06-12 13:55:55 +02:00
efivarfs	efi/efivars: Expose RT service availability via efivars abstraction	2020-07-09 10:14:29 +03:00
efs	block: move struct block_device to blk_types.h	2020-06-24 09:16:02 -06:00
erofs	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
exfat	exfat: fix name_hash computation on big endian systems	2020-07-21 10:44:19 +09:00
exportfs
ext2	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
ext4	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
f2fs	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
fat	treewide: Remove uninitialized_var() usage	2020-07-16 12:35:15 -07:00
freevxfs
fscache	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-06-03 16:27:18 -07:00
fuse	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
gfs2	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
hfs	Merge commit 382625d0d4 ("Merge tag 'for-5.9/block-20200802' of git://git.kernel.dk/linux-block") into android-mainline	2020-08-06 10:07:17 -07:00
hfsplus	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
hostfs	hostfs: Use kasprintf() instead of fixed buffer formatting	2020-03-29 23:23:00 +02:00
hpfs	hpfs: fix warning due to superfluous semicolon	2020-06-06 10:08:17 -07:00
hugetlbfs	mmap locking API: convert mmap_sem API comments	2020-06-09 09:39:14 -07:00
incfs	ANDROID: Incremental fs: Fix incfs to work on virtio-9p	2020-08-04 17:06:31 +00:00
iomap	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
isofs	Remove uninitialized_var() macro for v5.9-rc1	2020-08-04 13:49:43 -07:00
jbd2	This is the second round of ext4 commits for 5.8 merge window. It	2020-06-15 09:32:10 -07:00
jffs2	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
jfs	Merge commit 382625d0d4 ("Merge tag 'for-5.9/block-20200802' of git://git.kernel.dk/linux-block") into android-mainline	2020-08-06 10:07:17 -07:00
kernfs	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
lockd	proc: convert everything to "struct proc_ops"	2020-02-04 03:05:26 +00:00
minix
nfs	Merge c0842fbc1b ("random32: move the pseudo-random 32-bit definitions to prandom.h") into android-mainline	2020-08-07 14:27:37 +02:00
nfs_common
nfsd	\n	2020-08-06 19:29:51 -07:00
nilfs2	nilfs2: fix null pointer dereference at nilfs_segctor_do_construct()	2020-06-10 19:14:17 -07:00
nls	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
notify	fanotify: compare fsid when merging name event	2020-07-28 10:58:07 +02:00
ntfs	block: move block-related definitions out of fs.h	2020-06-24 09:16:02 -06:00
ocfs2	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
omfs	treewide: Remove uninitialized_var() usage	2020-07-16 12:35:15 -07:00
openpromfs
orangefs	Merge 3b69e8b457 ("Merge tag 'sh-for-5.8' of git://git.libc.org/linux-sh") into android-mainline	2020-06-24 12:27:21 +02:00
overlayfs	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
proc	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
pstore	pstore: Fix linking when crypto API disabled	2020-07-06 19:42:31 -07:00
qnx4
qnx6	fs: convert mpage_readpages to mpage_readahead	2020-06-02 10:59:07 -07:00
quota	\n	2020-08-06 19:28:26 -07:00
ramfs	fs_parse: fold fs_parameter_desc/fs_parameter_spec	2020-02-07 14:48:37 -05:00
reiserfs	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
romfs	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
squashfs	Merge branch 'upstream-master' into android-mainline	2020-07-25 13:15:34 +02:00
sysfs	RDMA 5.8 merge window pull request	2020-06-05 14:05:57 -07:00
sysv	docs: filesystems: fix renamed references	2020-04-20 15:45:22 -06:00
tracefs
ubifs	Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline	2020-08-07 16:01:35 +02:00
udf	\n	2020-08-06 19:28:26 -07:00
ufs
unicode	Merge 5364abc579 ("Merge tag 'arc-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc") into android-mainline	2020-04-08 09:25:42 +02:00
vboxsf	vboxsf: don't use the source name in the bdi name	2020-05-07 08:45:47 -06:00
verity	fs-verity: use smp_load_acquire() for ->i_verity_info	2020-07-21 16:02:41 -07:00
xfs	Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline	2020-08-07 16:19:28 +02:00
zonefs	New code for 5.9:	2020-08-06 19:35:12 -07:00
aio.c	aio: Replace zero-length array with flexible-array	2020-06-15 23:08:25 -05:00
anon_inodes.c
attr.c	Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"	2020-05-29 08:49:31 +02:00
bad_inode.c	fs: move the fiemap definitions out of fs.h	2020-06-03 23:16:55 -04:00
binfmt_aout.c	exec: Rename flush_old_exec begin_new_exec	2020-05-07 16:55:47 -05:00
binfmt_elf_fdpic.c	Merge branch 'uaccess.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-06-10 16:02:54 -07:00
binfmt_elf.c	Merge branch 'uaccess.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-06-10 16:02:54 -07:00
binfmt_em86.c	Merge branch 'akpm' (patches from Andrew)	2020-06-04 19:18:29 -07:00
binfmt_flat.c	Merge branch 'uaccess.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-06-10 16:02:54 -07:00
binfmt_misc.c	Merge branch 'akpm' (patches from Andrew)	2020-06-04 19:18:29 -07:00
binfmt_script.c	Merge branch 'akpm' (patches from Andrew)	2020-06-04 19:18:29 -07:00
block_dev.c	for-5.9/io_uring-20200802	2020-08-03 13:01:22 -07:00
buffer.c	for-5.9/block-20200802	2020-08-03 11:57:03 -07:00
char_dev.c	vfs: allow unprivileged whiteout creation	2020-05-14 16:44:23 +02:00
compat_binfmt_elf.c	Split the old READ_IMPLIES_EXEC workaround from executable PT_GNU_STACK	2020-06-05 13:45:21 -07:00
compat.c
coredump.c	mmap locking API: convert mmap_sem comments	2020-06-09 09:39:14 -07:00
d_path.c
dax.c	dax,iomap: Add helper dax_iomap_zero() to zero a range	2020-04-02 19:15:03 -07:00
dcache.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-06-03 16:27:18 -07:00
dcookies.c
direct-io.c	Merge commit 382625d0d4 ("Merge tag 'for-5.9/block-20200802' of git://git.kernel.dk/linux-block") into android-mainline	2020-08-06 10:07:17 -07:00
drop_caches.c	sysctl: pass kernel pointers to ->proc_handler	2020-04-27 02:07:40 -04:00
eventfd.c	eventfd: convert to f_op->read_iter()	2020-05-06 22:33:43 -04:00
eventpoll.c	Linux 5.7-rc6	2020-05-18 08:44:32 +02:00
exec.c	exec: Implement kernel_execve	2020-07-21 08:24:52 -05:00
fcntl.c	fcntl: Distribute switch variables for initialization	2020-03-03 10:55:06 -05:00
fhandle.c
file_table.c	Revert "fs: Do not check if there is a fsnotify watcher on pseudo inodes"	2020-06-29 09:40:55 -07:00
file.c	close-range-v5.9	2020-08-04 15:12:02 -07:00
filesystems.c	fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()	2020-04-10 15:36:22 -07:00
fs_context.c	vfs: don't parse "silent" option	2020-05-14 16:44:25 +02:00
fs_parser.c	fs_parse: remove pr_notice() about each validation	2020-04-02 09:35:26 -07:00
fs_pin.c
fs_struct.c	ANDROID: sdcardfs: remove sdcardfs from system	2020-05-29 08:49:21 +02:00
fs_types.c
fs-writeback.c	A lot of bug fixes and cleanups for ext4, including:	2020-06-05 16:19:28 -07:00
fsopen.c	add prefix to fs_context->log	2020-02-07 14:48:35 -05:00
inode.c	AFS Changes	2020-06-05 16:26:36 -07:00
internal.h	block: move block-related definitions out of fs.h	2020-06-24 09:16:02 -06:00
io_uring.c	for-5.9/io_uring-20200802	2020-08-03 13:01:22 -07:00
io-wq.c	io-wq: update hash bits	2020-07-25 09:47:44 -06:00
io-wq.h	io_uring/io-wq: move RLIMIT_FSIZE to io-wq	2020-07-24 13:00:44 -06:00
ioctl.c	fs: remove the access_ok() check in ioctl_fiemap	2020-06-03 23:16:55 -04:00
Kconfig	Linux 5.8-rc1	2020-06-25 14:25:32 +02:00
Kconfig.binfmt	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
libfs.c	ANDROID: f2fs: fix bad merge resolutions	2020-06-25 08:49:01 -07:00
locks.c	File locking fix for v5.9.	2020-08-03 10:46:41 -07:00
Makefile	ANDROID: sdcardfs: remove sdcardfs from system	2020-05-29 08:49:21 +02:00
mbcache.c
mount.h	proc/mounts: add cursor	2020-05-14 16:44:24 +02:00
mpage.c	Merge 94709049fb ("Merge branch 'akpm' (patches from Andrew)") into android-mainline	2020-06-12 14:39:46 +02:00
namei.c	Merge ad57a1022f ("Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline	2020-06-24 17:54:12 +02:00
namespace.c	Linux 5.8-rc6	2020-07-20 10:50:17 +02:00
no-block.c
nsfs.c	nsproxy: attach to namespaces via pidfds	2020-05-13 11:41:22 +02:00
open.c	close_range: add CLOSE_RANGE_UNSHARE	2020-06-17 00:07:38 +02:00
pipe.c	Notifications over pipes + Keyring notifications	2020-06-13 09:56:21 -07:00
pnode.c	Linux 5.7-rc4	2020-05-04 09:28:41 +02:00
pnode.h
posix_acl.c	Merge ad57a1022f ("Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline	2020-06-24 17:54:12 +02:00
proc_namespace.c	ANDROID: update to latest fscrypt and UFS inline crypto patches	2020-07-14 10:30:33 -07:00
read_write.c	fs: remove __vfs_read	2020-07-08 08:27:57 +02:00
readdir.c	readdir.c: get rid of the last __put_user(), drop now-useless access_ok()	2020-05-01 20:29:54 -04:00
select.c	pselect6() and friends: take handling the combined 6th/7th args into helper	2020-05-29 19:10:42 -04:00
seq_file.c	fs/seq_file.c: seq_read: Update pr_info_ratelimited	2020-06-04 19:06:25 -07:00
signalfd.c
splice.c	Notifications over pipes + Keyring notifications	2020-06-13 09:56:21 -07:00
stack.c
stat.c	New code for 5.8:	2020-06-02 19:45:12 -07:00
statfs.c
super.c	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-06-10 16:09:11 -07:00
sync.c	Linux 5.8-rc1	2020-06-25 14:25:32 +02:00
timerfd.c
userfaultfd.c	Merge 99f6cf61f1 ("Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux") into android-mainline	2020-08-06 17:02:44 +02:00
utimes.c	Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"	2020-05-29 08:49:31 +02:00
xattr.c	Linux 5.7	2020-06-01 09:17:17 +02:00