Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1355 from Rmys/master

Browse Source 
kernel-5.15.50
This commit is contained in:
Rmys
2022-06-25 19:59:29 +03:00
committed by GitHub
parent cc95408812 7dc7bb040c
commit c4f4af8997
10 changed files with 38539 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/kernel/files/configs/kernel-x86_64-config
+26 -24
View File
@@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.41 Kernel Configuration # Linux/x86_64 5.15.50 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (Pisi Linux) 10.3.0" CONFIG_CC_VERSION_TEXT="gcc (Pisi Linux) 10.3.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@@ -10110,29 +10110,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
# CONFIG_CRYPTO_STATS is not set # CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HASH_INFO=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10203,6 +10180,31 @@ CONFIG_GENERIC_IOMAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_ARCH_USE_SYM_ANNOTATIONS=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
# end of Crypto library routines
CONFIG_LIB_MEMNEQ=y
CONFIG_CRC_CCITT=y CONFIG_CRC_CCITT=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
kernel/kernel/files/patches/aufs5/aufs5-base.patch
+1 -1
View File
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs5.15.36 base patch aufs5.15.41 base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index c8103e57a70b..e1b9eaca78fd 100644 index c8103e57a70b..e1b9eaca78fd 100644
kernel/kernel/files/patches/aufs5/aufs5-kbuild.patch
+1 -1
View File
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs5.15.36 kbuild patch aufs5.15.41 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index a6313a969bc5..aca4b89d41a1 100644 index a6313a969bc5..aca4b89d41a1 100644
kernel/kernel/files/patches/aufs5/aufs5-loopback.patch
+1 -1
View File
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs5.15.36 loopback patch aufs5.15.41 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 7a9e40b97831..5ed06240cc9c 100644 index 7a9e40b97831..5ed06240cc9c 100644
kernel/kernel/files/patches/aufs5/aufs5-mmap.patch
+3 -3
View File
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs5.15.36 mmap patch aufs5.15.41 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c diff --git a/fs/proc/base.c b/fs/proc/base.c
index 1f394095eb88..93f2479ef319 100644 index 1f394095eb88..93f2479ef319 100644
@@ -72,7 +72,7 @@ index a6d21fc0033c..02c2de31196e 100644
ino = inode->i_ino; ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index 90c2d7f3c7a8..ab1b20fa5837 100644 index 04345ff97f8c..4ab9bb75c894 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1813,6 +1813,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1813,6 +1813,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -166,7 +166,7 @@ index fc60a40ce954..d45773672730 100644
obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o
+obj-$(CONFIG_AUFS_FS:m=y) += prfile.o +obj-$(CONFIG_AUFS_FS:m=y) += prfile.o
diff --git a/mm/filemap.c b/mm/filemap.c diff --git a/mm/filemap.c b/mm/filemap.c
index 1293c3409e42..42b012b99f4e 100644 index 00e391e75880..d8b52d814319 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -3353,7 +3353,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -3353,7 +3353,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
kernel/kernel/files/patches/aufs5/aufs5-standalone.patch
+7 -6
View File
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs5.15.36 standalone patch aufs5.15.41 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index bc5095b734f5..9508bd57a3bc 100644 index bc5095b734f5..9508bd57a3bc 100644
@@ -45,15 +45,16 @@ index 02382fa9bd34..3418c60b9014 100644
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force) int force)
diff -Nurp a/fs/file_table.c b/fs/file_table.c diff --git a/fs/file_table.c b/fs/file_table.c
--- a/fs/file_table.c 2022-03-20 22:14:17.000000000 +0200 index e8c9016703ad..5e7a880830fb 100644
+++ b/fs/file_table.c 2022-04-08 20:24:23.624148779 +0300 --- a/fs/file_table.c
@@ -198,6 +198,7 @@ over: +++ b/fs/file_table.c
@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
} }
return ERR_PTR(-ENFILE); return ERR_PTR(-ENFILE);
} }
+EXPORT_SYMBOL_GPL(alloc_empty_file); +EXPORT_SYMBOL_GPL(alloc_empty_file);
/* /*
* Variant of alloc_empty_file() that doesn't check and modify nr_files. * Variant of alloc_empty_file() that doesn't check and modify nr_files.
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
kernel/kernel/files/patches/aufs5/aufs5.15.41-20220530.patch
+38476
View File
File diff suppressed because it is too large Load Diff
kernel/kernel/files/patches/aufs5/tmpfs-idr.patch
+11 -11
View File
@@ -21,7 +21,7 @@ index 166158b6e917..0e9606171432 100644
umode_t mode; /* Mount mode for root directory */ umode_t mode; /* Mount mode for root directory */
unsigned char huge; /* Whether to try for hugepages */ unsigned char huge; /* Whether to try for hugepages */
diff --git a/mm/shmem.c b/mm/shmem.c diff --git a/mm/shmem.c b/mm/shmem.c
index 1609a8daba26..b3e5f52a5aa2 100644 index 342d1bc72867..460e4c54483f 100644
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -108,7 +108,7 @@ struct shmem_falloc { @@ -108,7 +108,7 @@ struct shmem_falloc {
@@ -88,7 +88,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
lockdep_annotate_inode_mutex_key(inode); lockdep_annotate_inode_mutex_key(inode);
} else } else
shmem_free_inode(sb); shmem_free_inode(sb);
@@ -3250,8 +3277,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) @@ -3252,8 +3279,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh) static int shmem_match(struct inode *ino, void *vfh)
{ {
__u32 *fh = vfh; __u32 *fh = vfh;
@@ -98,7 +98,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
return ino->i_ino == inum && fh[0] == ino->i_generation; return ino->i_ino == inum && fh[0] == ino->i_generation;
} }
@@ -3271,14 +3297,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3273,14 +3299,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL; struct dentry *dentry = NULL;
u64 inum; u64 inum;
@@ -116,7 +116,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
if (inode) { if (inode) {
dentry = shmem_find_alias(inode); dentry = shmem_find_alias(inode);
iput(inode); iput(inode);
@@ -3290,30 +3313,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3292,30 +3315,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len, static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
struct inode *parent) struct inode *parent)
{ {
@@ -150,7 +150,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
return 1; return 1;
} }
@@ -3392,7 +3400,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) @@ -3394,7 +3402,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
break; break;
case Opt_nr_inodes: case Opt_nr_inodes:
ctx->inodes = memparse(param->string, &rest); ctx->inodes = memparse(param->string, &rest);
@@ -159,7 +159,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
goto bad_value; goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES; ctx->seen |= SHMEM_SEEN_INODES;
break; break;
@@ -3502,7 +3510,7 @@ static int shmem_reconfigure(struct fs_context *fc) @@ -3504,7 +3512,7 @@ static int shmem_reconfigure(struct fs_context *fc)
{ {
struct shmem_options *ctx = fc->fs_private; struct shmem_options *ctx = fc->fs_private;
struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb); struct shmem_sb_info *sbinfo = SHMEM_SB(fc->root->d_sb);
@@ -168,7 +168,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
struct mempolicy *mpol = NULL; struct mempolicy *mpol = NULL;
const char *err; const char *err;
@@ -3571,7 +3579,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) @@ -3573,7 +3581,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
seq_printf(seq, ",size=%luk", seq_printf(seq, ",size=%luk",
sbinfo->max_blocks << (PAGE_SHIFT - 10)); sbinfo->max_blocks << (PAGE_SHIFT - 10));
if (sbinfo->max_inodes != shmem_default_max_inodes()) if (sbinfo->max_inodes != shmem_default_max_inodes())
@@ -177,7 +177,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
if (sbinfo->mode != (0777 | S_ISVTX)) if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode); seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID)) if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -3618,6 +3626,8 @@ static void shmem_put_super(struct super_block *sb) @@ -3620,6 +3628,8 @@ static void shmem_put_super(struct super_block *sb)
{ {
struct shmem_sb_info *sbinfo = SHMEM_SB(sb); struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
@@ -186,7 +186,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
free_percpu(sbinfo->ino_batch); free_percpu(sbinfo->ino_batch);
percpu_counter_destroy(&sbinfo->used_blocks); percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol); mpol_put(sbinfo->mpol);
@@ -3660,6 +3670,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) @@ -3662,6 +3672,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else #else
sb->s_flags |= SB_NOUSER; sb->s_flags |= SB_NOUSER;
#endif #endif
@@ -195,7 +195,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
sbinfo->max_blocks = ctx->blocks; sbinfo->max_blocks = ctx->blocks;
sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes; sbinfo->free_inodes = sbinfo->max_inodes = ctx->inodes;
if (sb->s_flags & SB_KERNMOUNT) { if (sb->s_flags & SB_KERNMOUNT) {
@@ -3777,6 +3789,15 @@ static void shmem_destroy_inodecache(void) @@ -3779,6 +3791,15 @@ static void shmem_destroy_inodecache(void)
kmem_cache_destroy(shmem_inode_cachep); kmem_cache_destroy(shmem_inode_cachep);
} }
@@ -211,7 +211,7 @@ index 1609a8daba26..b3e5f52a5aa2 100644
const struct address_space_operations shmem_aops = { const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage, .writepage = shmem_writepage,
.set_page_dirty = __set_page_dirty_no_writeback, .set_page_dirty = __set_page_dirty_no_writeback,
@@ -3918,6 +3939,7 @@ int __init shmem_init(void) @@ -3920,6 +3941,7 @@ int __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n"); pr_err("Could not kern_mount tmpfs\n");
goto out1; goto out1;
} }
kernel/kernel/files/patches/linux/patch-5.15.50.xz
BIN
View File
Binary file not shown.
kernel/kernel/pspec.xml
+13 -2
View File
@@ -33,10 +33,10 @@
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- Linux patches --> <!-- Linux patches -->
<Patch level="1" compressionType="xz">patches/linux/patch-5.15.41.xz</Patch> <Patch level="1" compressionType="xz">patches/linux/patch-5.15.50.xz</Patch>
<!-- aufs5 patchec --> <!-- aufs5 patchec -->
<Patch level="1">patches/aufs5/aufs5.15.36-20220509.patch</Patch> <Patch level="1">patches/aufs5/aufs5.15.41-20220530.patch</Patch>
<Patch level="1">patches/aufs5/aufs5-base.patch</Patch> <Patch level="1">patches/aufs5/aufs5-base.patch</Patch>
<Patch level="1">patches/aufs5/aufs5-kbuild.patch</Patch> <Patch level="1">patches/aufs5/aufs5-kbuild.patch</Patch>
<Patch level="1">patches/aufs5/aufs5-loopback.patch</Patch> <Patch level="1">patches/aufs5/aufs5-loopback.patch</Patch>
@@ -161,6 +161,17 @@
</Package> </Package>
<History> <History>
<Update release="73">
<Date>2022-06-25</Date>
<Version>5.15.50</Version>
<Comment>Version bump.</Comment>
<Type package="kernel">security</Type>
<Requires>
<Action package="kernel">systemRestart</Action>
</Requires>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="72"> <Update release="72">
<Date>2022-05-22</Date> <Date>2022-05-22</Date>
<Version>5.15.41</Version> <Version>5.15.41</Version>