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
..
dir.c	fs/kernfs/dir.c: Clean code by removing always true condition	2020-01-14 16:14:47 +01:00
file.c	fsnotify: pass dir and inode arguments to fsnotify()	2020-07-27 23:15:48 +02:00
inode.c	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
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
kernfs-internal.h	kernfs: Add option to enable user xattrs	2020-03-16 15:53:47 -04:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
mount.c	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2019-12-06 09:06:58 -08:00
symlink.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 428	2019-06-05 17:37:16 +02:00