xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3ad11d7ac8 ("Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline

Browse Source 
Steps on the way to 5.10-rc1

Resolves conflicts in:
	include/linux/blk-crypto.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4012850c2e4b804d9e87e90b8e03a3b9ce21b5e7
This commit is contained in:
Greg Kroah-Hartman
2020-10-23 15:54:11 +02:00
parent 072f3a5b28 3ad11d7ac8
commit c62fe038fe
139 changed files with 1633 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/suspend.h
View File

@@ -473,9 +473,9 @@ static inline int hibernate_quiet_exec(int (*func)(void *data), void *data) {
#endif /* CONFIG_HIBERNATION */
#ifdef CONFIG_HIBERNATION_SNAPSHOT_DEV
int is_hibernate_resume_dev(const struct inode *);
int is_hibernate_resume_dev(dev_t dev);
#else
static inline int is_hibernate_resume_dev(const struct inode *i) { return 0; }
static inline int is_hibernate_resume_dev(dev_t dev) { return 0; }
#endif
/* Hibernation and suspend events */