aosp/android-mainline: update series (rebase onto v5.7-329-g81e8c10dac62)
up to 88107615b41e ("Merge 81e8c10dac62 ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6") into android-mainline")
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ibb053c9e6e363a1fdf60f42cf2c9d0f027b1d4b9
diff --git a/android-mainline/ANDROID-fscrypt-fix-export-symbol-type.patch b/android-mainline/ANDROID-fscrypt-fix-export-symbol-type.patch
index 10b2fbd..0feb0c8 100644
--- a/android-mainline/ANDROID-fscrypt-fix-export-symbol-type.patch
+++ b/android-mainline/ANDROID-fscrypt-fix-export-symbol-type.patch
@@ -19,7 +19,7 @@
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
-@@ -582,4 +582,4 @@ int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
+@@ -577,4 +577,4 @@ int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
return valid;
}
diff --git a/android-mainline/FROMLIST-HID-nintendo-add-nintendo-switch-controller-driver.patch b/android-mainline/FROMLIST-HID-nintendo-add-nintendo-switch-controller-driver.patch
index 5b35597..7c066d7 100644
--- a/android-mainline/FROMLIST-HID-nintendo-add-nintendo-switch-controller-driver.patch
+++ b/android-mainline/FROMLIST-HID-nintendo-add-nintendo-switch-controller-driver.patch
@@ -32,7 +32,7 @@
diff --git a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -11992,6 +11992,12 @@ W: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
+@@ -12001,6 +12001,12 @@ W: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
F: Documentation/scsi/NinjaSCSI.rst
F: drivers/scsi/nsp32*
diff --git a/android-mainline/FROMLIST-Update-Inline-Encryption-from-v5-to-v6-of-patch-series.patch b/android-mainline/FROMLIST-Update-Inline-Encryption-from-v5-to-v6-of-patch-series.patch
index 6c0a817..390f34d 100644
--- a/android-mainline/FROMLIST-Update-Inline-Encryption-from-v5-to-v6-of-patch-series.patch
+++ b/android-mainline/FROMLIST-Update-Inline-Encryption-from-v5-to-v6-of-patch-series.patch
@@ -3150,7 +3150,7 @@
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
-@@ -117,7 +117,7 @@ int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname,
+@@ -112,7 +112,7 @@ int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname,
struct skcipher_request *req = NULL;
DECLARE_CRYPTO_WAIT(wait);
const struct fscrypt_info *ci = inode->i_crypt_info;
@@ -3159,7 +3159,7 @@
union fscrypt_iv iv;
struct scatterlist sg;
int res;
-@@ -170,7 +170,7 @@ static int fname_decrypt(const struct inode *inode,
+@@ -165,7 +165,7 @@ static int fname_decrypt(const struct inode *inode,
DECLARE_CRYPTO_WAIT(wait);
struct scatterlist src_sg, dst_sg;
const struct fscrypt_info *ci = inode->i_crypt_info;
diff --git a/android-mainline/FROMLIST-f2fs-Handle-casefolding-with-Encryption.patch b/android-mainline/FROMLIST-f2fs-Handle-casefolding-with-Encryption.patch
index 1205c3f..ffc62ef 100644
--- a/android-mainline/FROMLIST-f2fs-Handle-casefolding-with-Encryption.patch
+++ b/android-mainline/FROMLIST-f2fs-Handle-casefolding-with-Encryption.patch
@@ -217,7 +217,7 @@
diff --git a/fs/f2fs/hash.c b/fs/f2fs/hash.c
--- a/fs/f2fs/hash.c
+++ b/fs/f2fs/hash.c
-@@ -68,8 +68,9 @@ static void str2hashbuf(const unsigned char *msg, size_t len,
+@@ -67,8 +67,9 @@ static void str2hashbuf(const unsigned char *msg, size_t len,
*buf++ = pad;
}
@@ -229,7 +229,7 @@
{
__u32 hash;
f2fs_hash_t f2fs_hash;
-@@ -79,12 +80,17 @@ static f2fs_hash_t __f2fs_dentry_hash(const struct qstr *name_info,
+@@ -78,12 +79,17 @@ static f2fs_hash_t __f2fs_dentry_hash(const struct qstr *name_info,
size_t len = name_info->len;
/* encrypted bigname case */
@@ -248,7 +248,7 @@
/* Initialize the default seed for the hash checksum functions */
buf[0] = 0x67452301;
buf[1] = 0xefcdab89;
-@@ -106,7 +112,7 @@ static f2fs_hash_t __f2fs_dentry_hash(const struct qstr *name_info,
+@@ -105,7 +111,7 @@ static f2fs_hash_t __f2fs_dentry_hash(const struct qstr *name_info,
}
f2fs_hash_t f2fs_dentry_hash(const struct inode *dir,
@@ -257,7 +257,7 @@
{
#ifdef CONFIG_UNICODE
struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb);
-@@ -114,27 +120,30 @@ f2fs_hash_t f2fs_dentry_hash(const struct inode *dir,
+@@ -113,27 +119,30 @@ f2fs_hash_t f2fs_dentry_hash(const struct inode *dir,
int r, dlen;
unsigned char *buff;
struct qstr folded;
diff --git a/android-mainline/FROMLIST-f2fs-Use-generic-casefolding-support.patch b/android-mainline/FROMLIST-f2fs-Use-generic-casefolding-support.patch
index f967aec..a758b39 100644
--- a/android-mainline/FROMLIST-f2fs-Use-generic-casefolding-support.patch
+++ b/android-mainline/FROMLIST-f2fs-Use-generic-casefolding-support.patch
@@ -152,7 +152,7 @@
diff --git a/fs/f2fs/hash.c b/fs/f2fs/hash.c
--- a/fs/f2fs/hash.c
+++ b/fs/f2fs/hash.c
-@@ -110,7 +110,7 @@ f2fs_hash_t f2fs_dentry_hash(const struct inode *dir,
+@@ -109,7 +109,7 @@ f2fs_hash_t f2fs_dentry_hash(const struct inode *dir,
{
#ifdef CONFIG_UNICODE
struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb);
diff --git a/android-mainline/FROMLIST-fscrypt-Have-filesystems-handle-their-d_ops.patch b/android-mainline/FROMLIST-fscrypt-Have-filesystems-handle-their-d_ops.patch
index 503ce93..e3afeb4 100644
--- a/android-mainline/FROMLIST-fscrypt-Have-filesystems-handle-their-d_ops.patch
+++ b/android-mainline/FROMLIST-fscrypt-Have-filesystems-handle-their-d_ops.patch
@@ -35,7 +35,7 @@
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
-@@ -543,7 +543,7 @@ EXPORT_SYMBOL_GPL(fscrypt_fname_siphash);
+@@ -538,7 +538,7 @@ EXPORT_SYMBOL_GPL(fscrypt_fname_siphash);
* Validate dentries in encrypted directories to make sure we aren't potentially
* caching stale dentries after a key has been added.
*/
@@ -44,7 +44,7 @@
{
struct dentry *dir;
int err;
-@@ -582,7 +582,4 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
+@@ -577,7 +577,4 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
return valid;
}
diff --git a/android-mainline/series b/android-mainline/series
index c4970fc..660a75e 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
#
# android-mainline patches
#
-# Applies onto upstream 729ea4e06420 Linux v5.7-214-g729ea4e06420
-# Matches android-mainline 21e6d932da37 ("ANDROID: Incremental fs: Cache successful hash calculations")
+# Applies onto upstream 81e8c10dac62 Linux v5.7-329-g81e8c10dac62
+# Matches android-mainline 88107615b41e ("Merge 81e8c10dac62 ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6") into android-mainline")
#
Revert-security-lockdown-selinux-implement-SELinux-lockdown.patch
Revert-drm-virtio-fix-DRM_FORMAT_-handling.patch
