rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-6.1.0-0.rc5.39

Browse Source 
* Mon Nov 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc5.39]
- Linux v6.1.0-0.rc5
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-11-14 07:36:19 -06:00
parent 5b136243c9
commit f5e78c0a03
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
25 changed files with 60 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Patchlist.changelog
View File

@ -1,6 +1,3 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/44cbcd6764df14eef098f094c1477d340e3a060b
44cbcd6764df14eef098f094c1477d340e3a060b fs: fix leaked psi pressure state
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a5465769aab281eaccf26b6b2c1659e26de74074
a5465769aab281eaccf26b6b2c1659e26de74074 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev

2
kernel-aarch64-debug-fedora.config
View File

@ -1958,6 +1958,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
@ -7940,6 +7941,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
CONFIG_TEST_LOCKUP=m
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-aarch64-debug-rhel.config
View File

@ -1480,6 +1480,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6295,6 +6296,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-aarch64-fedora.config
View File

@ -1950,6 +1950,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
@ -7917,6 +7918,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-aarch64-rhel.config
View File

@ -1472,6 +1472,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6270,6 +6271,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-armv7hl-debug-fedora.config
View File

@ -1953,6 +1953,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
@ -8020,6 +8021,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
CONFIG_TEST_LOCKUP=m
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-armv7hl-fedora.config
View File

@ -1946,6 +1946,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
@ -7999,6 +8000,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -1910,6 +1910,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
@ -7790,6 +7791,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
CONFIG_TEST_LOCKUP=m
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-armv7hl-lpae-fedora.config
View File

@ -1903,6 +1903,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
@ -7769,6 +7770,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-ppc64le-debug-fedora.config
View File

@ -1512,6 +1512,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
@ -6685,6 +6686,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
CONFIG_TEST_LOCKUP=m
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-ppc64le-debug-rhel.config
View File

@ -1321,6 +1321,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6043,6 +6044,7 @@ CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-ppc64le-fedora.config
View File

@ -1503,6 +1503,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
@ -6662,6 +6663,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-ppc64le-rhel.config
View File

@ -1313,6 +1313,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6020,6 +6021,7 @@ CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-s390x-debug-fedora.config
View File

@ -1519,6 +1519,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
@ -6628,6 +6629,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
CONFIG_TEST_LOCKUP=m
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-s390x-debug-rhel.config
View File

@ -1327,6 +1327,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6017,6 +6018,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-s390x-fedora.config
View File

@ -1510,6 +1510,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
@ -6605,6 +6606,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-s390x-rhel.config
View File

@ -1319,6 +1319,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -5994,6 +5995,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-s390x-zfcpdump-rhel.config
View File

@ -1324,6 +1324,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6019,6 +6020,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-x86_64-debug-fedora.config
View File

@ -1638,6 +1638,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
@ -7101,6 +7102,7 @@ CONFIG_TEST_LIST_SORT=m
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
CONFIG_TEST_LOCKUP=m
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-x86_64-debug-rhel.config
View File

@ -1400,6 +1400,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6279,6 +6280,7 @@ CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
CONFIG_TEST_MIN_HEAP=m

2
kernel-x86_64-fedora.config
View File

@ -1629,6 +1629,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
@ -7079,6 +7080,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIVEPATCH is not set
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

2
kernel-x86_64-rhel.config
View File

@ -1392,6 +1392,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIL_SII8620 is not set
@ -6255,6 +6256,7 @@ CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_MIN_HEAP is not set

12
kernel.spec
View File

@ -119,17 +119,17 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
%define debugbuildsenabled 1
# define buildid .local
%define specversion 6.1.0
%define patchversion 6.1
%define pkgrelease 0.rc4.20221111git4bbf3422df78.39
%define pkgrelease 0.rc5.39
%define kversion 6
%define tarfile_release 6.1-rc4-159-g4bbf3422df78
%define tarfile_release 6.1-rc5
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc4.20221111git4bbf3422df78.39%{?buildid}%{?dist}
%define specrelease 0.rc5.39%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
@ -3190,8 +3190,8 @@ fi
#
#
%changelog
* Fri Nov 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc4.4bbf3422df78.39]
- fs: fix leaked psi pressure state (Johannes Weiner)
* Mon Nov 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc5.39]
- Linux v6.1.0-0.rc5
* Fri Nov 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc4.4bbf3422df78.38]
- Linux v6.1.0-0.rc4.4bbf3422df78

123
patch-6.1-redhat.patch
View File

@ -41,8 +41,6 @@
drivers/scsi/qla4xxx/ql4_os.c | 2 +
drivers/usb/core/hub.c | 7 +
fs/afs/main.c | 3 +
fs/btrfs/compression.c | 14 +-
fs/erofs/zdata.c | 18 +-
include/linux/efi.h | 22 +-
include/linux/kernel.h | 21 +
include/linux/lsm_hook_defs.h | 2 +
@ -66,7 +64,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
68 files changed, 1559 insertions(+), 200 deletions(-)
66 files changed, 1540 insertions(+), 187 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a465d5242774..191876dd4731 100644
@ -122,7 +120,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
index ac2ec990422d..6f23c2014800 100644
index 58cd4f5e1c3a..c1eddea3caed 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -1228,7 +1226,7 @@ index ee4da9ab8013..d395d11eadc4 100644
if (ret < 0)
goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index dc4220600585..758d2239af64 100644
index da55ce45ac70..e697c37a111e 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -1780,111 +1778,8 @@ index eae288c8d40a..8b8bf447cedc 100644
return ret;
error_proc:
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index f1f051ad3147..e6635fe70067 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -512,7 +512,7 @@ static u64 bio_end_offset(struct bio *bio)
static noinline int add_ra_bio_pages(struct inode *inode,
u64 compressed_end,
struct compressed_bio *cb,
- unsigned long *pflags)
+ int *memstall, unsigned long *pflags)
{
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
unsigned long end_index;
@@ -581,8 +581,10 @@ static noinline int add_ra_bio_pages(struct inode *inode,
continue;
}
- if (PageWorkingset(page))
+ if (!*memstall && PageWorkingset(page)) {
psi_memstall_enter(pflags);
+ *memstall = 1;
+ }
ret = set_page_extent_mapped(page);
if (ret < 0) {
@@ -670,8 +672,8 @@ void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
u64 em_len;
u64 em_start;
struct extent_map *em;
- /* Initialize to 1 to make skip psi_memstall_leave unless needed */
- unsigned long pflags = 1;
+ unsigned long pflags;
+ int memstall = 0;
blk_status_t ret;
int ret2;
int i;
@@ -727,7 +729,7 @@ void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
goto fail;
}
- add_ra_bio_pages(inode, em_start + em_len, cb, &pflags);
+ add_ra_bio_pages(inode, em_start + em_len, cb, &memstall, &pflags);
/* include any pages we added in add_ra-bio_pages */
cb->len = bio->bi_iter.bi_size;
@@ -807,7 +809,7 @@ void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
}
}
- if (!pflags)
+ if (memstall)
psi_memstall_leave(&pflags);
if (refcount_dec_and_test(&cb->pending_ios))
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index c7f24fc7efd5..064a166324a7 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1412,8 +1412,8 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f,
struct block_device *last_bdev;
unsigned int nr_bios = 0;
struct bio *bio = NULL;
- /* initialize to 1 to make skip psi_memstall_leave unless needed */
- unsigned long pflags = 1;
+ unsigned long pflags;
+ int memstall = 0;
bi_private = jobqueueset_init(sb, q, fgq, force_fg);
qtail[JQ_BYPASS] = &q[JQ_BYPASS]->head;
@@ -1463,14 +1463,18 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f,
if (bio && (cur != last_index + 1 ||
last_bdev != mdev.m_bdev)) {
submit_bio_retry:
- if (!pflags)
- psi_memstall_leave(&pflags);
submit_bio(bio);
+ if (memstall) {
+ psi_memstall_leave(&pflags);
+ memstall = 0;
+ }
bio = NULL;
}
- if (unlikely(PageWorkingset(page)))
+ if (unlikely(PageWorkingset(page)) && !memstall) {
psi_memstall_enter(&pflags);
+ memstall = 1;
+ }
if (!bio) {
bio = bio_alloc(mdev.m_bdev, BIO_MAX_VECS,
@@ -1500,9 +1504,9 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f,
} while (owned_head != Z_EROFS_PCLUSTER_TAIL);
if (bio) {
- if (!pflags)
- psi_memstall_leave(&pflags);
submit_bio(bio);
+ if (memstall)
+ psi_memstall_leave(&pflags);
}
/*
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 929d559ad41d..3fa273ff1c22 100644
index 7603fc58c47c..1099e99286c6 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
@ -1896,7 +1791,7 @@ index 929d559ad41d..3fa273ff1c22 100644
typedef unsigned long efi_status_t;
typedef u8 efi_bool_t;
typedef u16 efi_char16_t; /* UNICODE character */
@@ -863,6 +865,14 @@ extern int __init efi_setup_pcdp_console(char *);
@@ -864,6 +866,14 @@ extern int __init efi_setup_pcdp_console(char *);
#define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
#define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */
#define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */
@ -1911,7 +1806,7 @@ index 929d559ad41d..3fa273ff1c22 100644
#ifdef CONFIG_EFI
/*
@@ -874,6 +884,8 @@ static inline bool efi_enabled(int feature)
@@ -875,6 +885,8 @@ static inline bool efi_enabled(int feature)
}
extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
@ -1920,7 +1815,7 @@ index 929d559ad41d..3fa273ff1c22 100644
bool __pure __efi_soft_reserve_enabled(void);
static inline bool __pure efi_soft_reserve_enabled(void)
@@ -895,6 +907,8 @@ static inline bool efi_enabled(int feature)
@@ -896,6 +908,8 @@ static inline bool efi_enabled(int feature)
static inline void
efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
@ -1929,7 +1824,7 @@ index 929d559ad41d..3fa273ff1c22 100644
static inline bool efi_soft_reserve_enabled(void)
{
return false;
@@ -909,6 +923,7 @@ static inline void efi_find_mirror(void) {}
@@ -910,6 +924,7 @@ static inline void efi_find_mirror(void) {}
#endif
extern int efi_status_to_err(efi_status_t status);
@ -1937,7 +1832,7 @@ index 929d559ad41d..3fa273ff1c22 100644
/*
* Variable Attributes
@@ -1134,13 +1149,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
@@ -1135,13 +1150,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
extern unsigned long efi_call_virt_save_flags(void);

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.1-rc4-159-g4bbf3422df78.tar.xz) = 1ec7eb6887c532a992aca5280af5d9d8ebb98a79061c4a8e476a8112fcaffe88e51720fff758c64eaa65aca6179532478f1761146aa914bdf8d4f37236021657
SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 75e6738e6a5d30ef341772e27d8f2a502c54e8af61dab0a3448f70e2d9a270ae7616e9a9562121e9c35aeecb24259dd7858e5240b853dbfa103aab13dbcbcf95
SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 1a0e0585772583d421df42299b951d39e72ff38dc4053a76ce3f846972df773eb15c898ed73261c35ee809d0c5830211a1ecb9c52cfbaef40be7a3e7a86a6e9c
SHA512 (linux-6.1-rc5.tar.xz) = 849a180ba2caeda19d3d593372b23a942f8e5927a37b04921d182310303a8b7a94dacc825832eca06da6c5dfe4373df694969656ec62c53277b00f86a8535b2e
SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = e47ce527ed5056f684ec1c4daac721a0c1faff455e84a0e7d2302e3063595a2974036bff3ed9abf1e928225a773f409fdcd9bfac5115870b077a47e27ba3d68d
SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 0c8a3b00c08d1d9324f382cb07c2dc93a25749c7418734c425cf11aec328008a3c513681c661d372d7827106d3cc9b45dfb6235a387423344ee4eed2261fb1c6