summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-11-09 10:33:20 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-11-09 10:33:20 -0600
commit2bd3b79064972283c4a32129bed1fe20179b0316 (patch)
treeb41520965075ce4fb0cf30f9d47ea08f5ebf3f70
parent80b20b714154105c92ccdfdd858b906af808a2bf (diff)
downloadkernel-2bd3b79064972283c4a32129bed1fe20179b0316.tar.gz
kernel-2bd3b79064972283c4a32129bed1fe20179b0316.tar.xz
kernel-2bd3b79064972283c4a32129bed1fe20179b0316.zip
kernel-5.15-200
* Tue Nov 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-200] - Revert "[fs] dax: mark tech preview" (Justin M. Forbes) - Revert "wireguard: mark as Tech Preview" (Justin M. Forbes) - Revert "add pci_hw_vendor_status()" (Justin M. Forbes) - Input: i8042 - Add quirk for Fujitsu Lifebook T725 (Takashi Iwai) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Patchlist.changelog6
-rwxr-xr-xkernel.spec2
-rw-r--r--patch-5.15-redhat.patch62
-rw-r--r--sources2
4 files changed, 12 insertions, 60 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 4ce109aea..9c3dfa583 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/83006c3429d58b6247863c348495417636186107
+ 83006c3429d58b6247863c348495417636186107 Revert "[fs] dax: mark tech preview"
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/58b66eecb6ef60c71c5017aa0220b6e3e2a5e38f
+ 58b66eecb6ef60c71c5017aa0220b6e3e2a5e38f Revert "wireguard: mark as Tech Preview"
+
https://gitlab.com/cki-project/kernel-ark/-/commit/e7dd4e098056b44495d41d06418a11c4442447e0
e7dd4e098056b44495d41d06418a11c4442447e0 Revert "add pci_hw_vendor_status()"
diff --git a/kernel.spec b/kernel.spec
index b4f9fb5ea..fe30749f0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2973,6 +2973,8 @@ fi
#
%changelog
* Tue Nov 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-200]
+- Revert "[fs] dax: mark tech preview" (Justin M. Forbes)
+- Revert "wireguard: mark as Tech Preview" (Justin M. Forbes)
- Revert "add pci_hw_vendor_status()" (Justin M. Forbes)
- Input: i8042 - Add quirk for Fujitsu Lifebook T725 (Takashi Iwai)
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index 9ef422550..0ec5a5c2a 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -23,7 +23,7 @@
drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++---------
drivers/input/serio/i8042-x86ia64io.h | 14 +++
drivers/iommu/iommu.c | 22 ++++
- drivers/net/wireguard/main.c | 7 ++
+ drivers/net/wireguard/main.c | 6 +
drivers/nvme/host/core.c | 22 +++-
drivers/nvme/host/multipath.c | 19 ++--
drivers/nvme/host/nvme.h | 4 +
@@ -31,8 +31,6 @@
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +
drivers/usb/core/hub.c | 7 ++
fs/btrfs/async-thread.c | 14 +++
- fs/ext4/super.c | 5 +
- fs/xfs/xfs_super.c | 5 +
include/linux/efi.h | 22 ++--
include/linux/lsm_hook_defs.h | 2 +
include/linux/lsm_hooks.h | 6 +
@@ -46,7 +44,7 @@
security/lockdown/Kconfig | 13 +++
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 48 files changed, 727 insertions(+), 192 deletions(-)
+ 46 files changed, 716 insertions(+), 192 deletions(-)
diff --git a/Makefile b/Makefile
index ffcc7eadc44b..7c94a55d6770 100644
@@ -1300,7 +1298,7 @@ index 3303d707bab4..372edaaafaa1 100644
* Changes the default domain of an iommu group that has *only* one device
*
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c
-index 75dbe77b0b4b..029ff8576f8e 100644
+index 75dbe77b0b4b..4bd6dd722f44 100644
--- a/drivers/net/wireguard/main.c
+++ b/drivers/net/wireguard/main.c
@@ -12,6 +12,7 @@
@@ -1323,14 +1321,6 @@ index 75dbe77b0b4b..029ff8576f8e 100644
ret = wg_allowedips_slab_init();
if (ret < 0)
goto err_allowedips;
-@@ -48,6 +54,7 @@ static int __init mod_init(void)
- pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n");
- pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.\n");
-
-+ mark_tech_preview("WireGuard", THIS_MODULE);
- return 0;
-
- err_netlink:
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f8dd664b2eda..0ff9ea8340e4 100644
--- a/drivers/nvme/host/core.c
@@ -1571,52 +1561,6 @@ index 309516e6a968..d39af03b456c 100644
set_bit(WORK_DONE_BIT, &work->flags);
run_ordered_work(wq, work);
} else {
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 88d5d274a868..6693ff552b24 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -4298,6 +4298,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
- set_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags);
-
- if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) {
-+ static bool printed = false;
- if (ext4_has_feature_inline_data(sb)) {
- ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem"
- " that may contain inline data");
-@@ -4308,6 +4309,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
- "DAX unsupported by block device.");
- goto failed_mount;
- }
-+ if (!printed) {
-+ mark_tech_preview("ext4 direct access (dax)", NULL);
-+ printed = true;
-+ }
- }
-
- if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) {
-diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
-index c4e0cd1c1c8c..f80fa9b6d53e 100644
---- a/fs/xfs/xfs_super.c
-+++ b/fs/xfs/xfs_super.c
-@@ -1593,6 +1593,7 @@ xfs_fs_fill_super(
-
- if (xfs_has_dax_always(mp)) {
- bool rtdev_is_dax = false, datadev_is_dax;
-+ static bool printed = false;
-
- xfs_warn(mp,
- "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
-@@ -1612,6 +1613,10 @@ xfs_fs_fill_super(
- error = -EINVAL;
- goto out_filestream_unmount;
- }
-+ if (!printed) {
-+ mark_tech_preview("xfs direct access (dax)", NULL);
-+ printed = true;
-+ }
- }
-
- if (xfs_has_discard(mp)) {
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 6b5d36babfcc..fd4a5d66a9d0 100644
--- a/include/linux/efi.h
diff --git a/sources b/sources
index 95886ef84..a23fe901d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
SHA512 (linux-5.15.1.tar.xz) = 927a475f0cc40ed08c462130d799b0d74a6200d2db50c92940fc0d63c2aac9029ff4276e5bbfecad49953829599c155a96f8ce563d448f9649432e4c3d730b07
-SHA512 (kernel-abi-stablelists-5.15.1-200.tar.bz2) = f7a474c70bab304459569952e12a43f03e0ce9996d9fb1fd6e1dd26d694a2198f80b18e1140cd81be487c46ad9732b96463497006ffaf1682f1c7c5bc82e568f
+SHA512 (kernel-abi-stablelists-5.15.1-200.tar.bz2) = 3be403e64a33a4b0cbb11ecedcb730058f3da9eb62d29642a92f54001b571ac5a1c39b8773638c908d97e70f9b01c5a109968472c17087e76f53dcdcbc1d6049
SHA512 (kernel-kabi-dw-5.15.1-200.tar.bz2) = 8e06c53dd3b27a3980c9cbbfca86b12ddff0961c1534b56dc6bc292752dfa3dca455a5adbce56c559a4470563df868c62dec76d4ff06df474eef2392e22f8917