linux-uconsole/fs/ext2
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
..
acl.c ext2: cache NULL when both default_acl and acl are NULL 2018-09-03 11:05:03 +02:00
acl.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
balloc.c ext2: fix improper function comment 2019-11-07 12:35:27 +01:00
dir.c ext2: ext2_find_entry() return -ENOENT if no entry found 2020-07-09 08:14:00 +02:00
ext2.h ext2: ext2.h: fix duplicated word + typos 2020-07-27 10:58:06 +02:00
file.c mmap locking API: convert mmap_sem comments 2020-06-09 09:39:14 -07:00
ialloc.c ext2: fix missing percpu_counter_inc 2020-07-09 08:14:01 +02:00
inode.c ext2: fix some incorrect comments in inode.c 2020-07-09 08:14:01 +02:00
ioctl.c ext2: return error when fail to allocating memory in ioctl 2019-10-24 09:24:40 +02:00
Kconfig treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
namei.c ext2: ext2_find_entry() return -ENOENT if no entry found 2020-07-09 08:14:00 +02:00
super.c ext2: remove nocheck option 2020-07-09 08:14:01 +02:00
symlink.c ext2: code cleanup by removing ifdef macro surrounding 2020-05-22 15:11:00 +02:00
xattr.c ext2: initialize quota info in ext2_xattr_set() 2020-07-09 08:14:01 +02:00
xattr.h ext2: code cleanup by removing ifdef macro surrounding 2020-05-22 15:11:00 +02:00
xattr_security.c FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr 2019-11-05 13:50:57 -08:00
xattr_trusted.c FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr 2019-11-05 13:50:57 -08:00
xattr_user.c FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr 2019-11-05 13:50:57 -08:00