Greg Kroah-Hartman a17a563d16 Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline ...

Merges along the way to 5.9-rc1

resolves conflicts in:
	Documentation/ABI/testing/sysfs-class-power
	drivers/power/supply/power_supply_sysfs.c
	fs/crypto/inline_crypt.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia087834f54fb4e5269d68c3c404747ceed240701

2020-08-08 13:07:20 +02:00

..

crypto.c

ecryptfs: use crypto_shash_tfm_digest()

2020-05-08 15:32:15 +10:00

debug.c

Merge tag 'ecryptfs-5.3-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

2019-07-14 19:29:04 -07:00

dentry.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156

2019-05-30 11:26:35 -07:00

ecryptfs_kernel.h

eCryptfs: Replace deactivated email address

2020-02-14 20:07:31 +00:00

file.c

fs: compat_ioctl: move FITRIM emulation into file systems

2019-10-23 17:23:46 +02:00

inode.c

Merge 5.4-rc8 into android-mainline

2019-11-18 08:31:11 +01:00

Kconfig

docs: filesystems: fix renamed references

2020-04-20 15:45:22 -06:00

keystore.c

mm, treewide: rename kzfree() to kfree_sensitive()

2020-08-07 11:33:22 -07:00

kthread.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156

2019-05-30 11:26:35 -07:00

main.c

eCryptfs: Replace deactivated email address

2020-02-14 20:07:31 +00:00

Makefile

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

messaging.c

mm, treewide: rename kzfree() to kfree_sensitive()

2020-08-07 11:33:22 -07:00

miscdev.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 333

2019-06-05 17:37:06 +02:00

mmap.c

Merge 236f453294 ("Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline

2020-02-10 07:53:52 -08:00

read_write.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156

2019-05-30 11:26:35 -07:00

super.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156

2019-05-30 11:26:35 -07:00