Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora

12 files changed, 57 insertions, 29 deletions

diff --git a/Patchlist.changelog b/Patchlist.changelog
index 7bf99860b..668df2d86 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/c1862b27b603f8acf8ef8b64ae2f8650fd2ad267
+ c1862b27b603f8acf8ef8b64ae2f8650fd2ad267 disable enum64 BTF in fedora rawhide
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/00ba5833900e339ae56530fd79f2120bf0c757d8
  00ba5833900e339ae56530fd79f2120bf0c757d8 ovl: update ->f_iocb_flags when ovl_change_flags() modifies ->f_flags
 
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index d6a84b00c..5e07ff3db 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1519,6 +1519,7 @@ CONFIG_CRYPTO_SIMD=y
 # CONFIG_CRYPTO_SM3_ARM64_CE is not set
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 46b779d08..5f7ac5e8c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1146,6 +1146,7 @@ CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 0b8ab841d..072cb6137 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1519,6 +1519,7 @@ CONFIG_CRYPTO_SIMD=y
 # CONFIG_CRYPTO_SM3_ARM64_CE is not set
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index ef9d108e6..de3f65809 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1146,6 +1146,7 @@ CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 6a6e2c74d..ceff69acc 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -6390,10 +6390,10 @@ CONFIG_SC_DISPCC_7280=m
 CONFIG_SC_GCC_7180=y
 CONFIG_SC_GCC_7280=y
 # CONFIG_SC_GCC_8180X is not set
-# CONFIG_SC_GCC_8280XP is not set
+CONFIG_SC_GCC_8280XP=m
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index cccd9a1e5..4e0d22a2d 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -6371,10 +6371,10 @@ CONFIG_SC_DISPCC_7280=m
 CONFIG_SC_GCC_7180=y
 CONFIG_SC_GCC_7280=y
 # CONFIG_SC_GCC_8180X is not set
-# CONFIG_SC_GCC_8280XP is not set
+CONFIG_SC_GCC_8280XP=m
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 28e658116..b5a6cbe5b 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -6213,10 +6213,10 @@ CONFIG_SC_DISPCC_7280=m
 CONFIG_SC_GCC_7180=y
 CONFIG_SC_GCC_7280=y
 # CONFIG_SC_GCC_8180X is not set
-# CONFIG_SC_GCC_8280XP is not set
+CONFIG_SC_GCC_8280XP=m
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 59d4bdcf0..7809adaf9 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -6194,10 +6194,10 @@ CONFIG_SC_DISPCC_7280=m
 CONFIG_SC_GCC_7180=y
 CONFIG_SC_GCC_7280=y
 # CONFIG_SC_GCC_8180X is not set
-# CONFIG_SC_GCC_8280XP is not set
+CONFIG_SC_GCC_8280XP=m
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
diff --git a/kernel.spec b/kernel.spec
index 6db2f0e6f..0b624c132 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -138,7 +138,7 @@ Summary: The Linux kernel
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 225%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.1.1
+%define kabiversion 6.1.2
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3184,6 +3184,12 @@ fi
 #
 #
 %changelog
+* Sat Dec 31 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.2-0]
+- Configs fix up for 6.1.2 (Justin M. Forbes)
+- disable enum64 BTF in fedora rawhide (Jiri Olsa)
+- Turn on CONFIG_SC_GPUCC_8280XP (Justin M. Forbes)
+- Linux v6.1.2
+
 * Wed Dec 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.1-0]
 - ovl: update ->f_iocb_flags when ovl_change_flags() modifies ->f_flags (Al Viro)
 - Updates for building stable Fedora (Justin M. Forbes)
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index d5356a0bb..9379fee81 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -14,7 +14,7 @@
  drivers/firmware/efi/Makefile                      |   1 +
  drivers/firmware/efi/efi.c                         | 124 +++++++++++++++------
  drivers/firmware/efi/secureboot.c                  |  38 +++++++
- drivers/hid/hid-rmi.c                              |  64 -----------
+ drivers/hid/hid-rmi.c                              |  66 -----------
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
  drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
  drivers/iommu/iommu.c                              |  22 ++++
@@ -28,15 +28,16 @@
  include/linux/security.h                           |   5 +
  init/Kconfig                                       |   2 +-
  kernel/module/signing.c                            |   9 +-
+ scripts/pahole-flags.sh                            |   3 +
  scripts/tags.sh                                    |   2 +
  security/integrity/platform_certs/load_uefi.c      |   6 +-
  security/lockdown/Kconfig                          |  13 +++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 35 files changed, 450 insertions(+), 175 deletions(-)
+ 36 files changed, 453 insertions(+), 177 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 7307ae6c2ef7..36f8cf8b5097 100644
+index 2ecc568c779f..85b3b34336dd 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -135,7 +136,7 @@ index ab19ddb09d65..d463ec57b218 100644
  	/* boot_command_line has been already set up in early.c */
  	*cmdline_p = boot_command_line;
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 216fee7144ee..55e817aa000d 100644
+index 892609cde4a2..ad9aa11ba3a0 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -21,6 +21,7 @@
@@ -201,10 +202,10 @@ index 6aef1ee5e1bd..8f146b1b4972 100644
  	for (i = 0; i < hest_tab->error_source_count; i++) {
  		len = hest_esrc_len(hest_hdr);
 diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
-index 1cc4647f78b8..016d488cabc3 100644
+index c2c786eb95ab..4e3aa80cd5cf 100644
 --- a/drivers/acpi/irq.c
 +++ b/drivers/acpi/irq.c
-@@ -137,6 +137,7 @@ struct acpi_irq_parse_one_ctx {
+@@ -138,6 +138,7 @@ struct acpi_irq_parse_one_ctx {
  	unsigned int index;
  	unsigned long *res_flags;
  	struct irq_fwspec *fwspec;
@@ -212,7 +213,7 @@ index 1cc4647f78b8..016d488cabc3 100644
  };
 
  /**
-@@ -210,7 +211,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
+@@ -211,7 +212,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
  		return AE_CTRL_TERMINATE;
  	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
  		eirq = &ares->data.extended_irq;
@@ -222,7 +223,7 @@ index 1cc4647f78b8..016d488cabc3 100644
  			return AE_OK;
  		if (ctx->index >= eirq->interrupt_count) {
  			ctx->index -= eirq->interrupt_count;
-@@ -246,8 +248,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
+@@ -247,8 +249,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
  static int acpi_irq_parse_one(acpi_handle handle, unsigned int index,
  			      struct irq_fwspec *fwspec, unsigned long *flags)
  {
@@ -319,7 +320,7 @@ index bbf7029e224b..cf7faa970dd6 100644
  		dmi_decode_ipmi((const struct dmi_header *) dev->device_data);
 
 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index 49a1707693c9..8296a943611e 100644
+index d5ee52be176d..79e8fd5fbb06 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -35,6 +35,7 @@
@@ -330,7 +331,7 @@ index 49a1707693c9..8296a943611e 100644
  #include <linux/delay.h>
 
  #define IPMI_DRIVER_VERSION "39.2"
-@@ -5510,8 +5511,21 @@ static int __init ipmi_init_msghandler_mod(void)
+@@ -5514,8 +5515,21 @@ static int __init ipmi_init_msghandler_mod(void)
  {
  	int rv;
 
@@ -555,10 +556,10 @@ index 000000000000..de0a3714a5d4
 +	}
 +}
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
-index bb1f423f4ace..efc96776f761 100644
+index 84e7ba5314d3..efc96776f761 100644
 --- a/drivers/hid/hid-rmi.c
 +++ b/drivers/hid/hid-rmi.c
-@@ -321,19 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
+@@ -321,21 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
  {
  	struct rmi_data *hdata = hid_get_drvdata(hdev);
  	struct rmi_device *rmi_dev = hdata->xport.rmi_dev;
@@ -567,6 +568,8 @@ index bb1f423f4ace..efc96776f761 100644
  	if (!(test_bit(RMI_STARTED, &hdata->flags)))
  		return 0;
 
+-	pm_wakeup_event(hdev->dev.parent, 0);
+-
 -	local_irq_save(flags);
 -
  	rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2);
@@ -578,7 +581,7 @@ index bb1f423f4ace..efc96776f761 100644
  	return 1;
  }
 
-@@ -589,56 +582,6 @@ static const struct rmi_transport_ops hid_rmi_ops = {
+@@ -591,56 +582,6 @@ static const struct rmi_transport_ops hid_rmi_ops = {
  	.reset		= rmi_hid_reset,
  };
 
@@ -635,7 +638,7 @@ index bb1f423f4ace..efc96776f761 100644
  static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
  {
  	struct rmi_data *data = NULL;
-@@ -711,18 +654,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -713,18 +654,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
  	mutex_init(&data->page_mutex);
 
@@ -898,7 +901,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644
  	if (data->f01_container->dev.driver) {
  		/* Driver already bound, so enable ATTN now. */
 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index 65a3b3d886dc..911b64ce9889 100644
+index 959d895fc1df..ced88384a6ee 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
 @@ -8,6 +8,7 @@
@@ -909,7 +912,7 @@ index 65a3b3d886dc..911b64ce9889 100644
  #include <linux/kernel.h>
  #include <linux/bits.h>
  #include <linux/bug.h>
-@@ -2818,6 +2819,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
+@@ -2834,6 +2835,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
  }
  EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);
 
@@ -991,7 +994,7 @@ index bbab424b0d55..ed86042fb57b 100644
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
 diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
-index a1a22f58ba18..dd688a842b0b 100644
+index d066be3b9226..6011f955436b 100644
 --- a/fs/overlayfs/file.c
 +++ b/fs/overlayfs/file.c
 @@ -96,6 +96,7 @@ static int ovl_change_flags(struct file *file, unsigned int flags)
@@ -1171,6 +1174,18 @@ index a2ff4242e623..f0d2be1ee4f1 100644
  }
 
  int module_sig_check(struct load_info *info, int flags)
+diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
+index 0d99ef17e4a5..81c8e082ec57 100755
+--- a/scripts/pahole-flags.sh
++++ b/scripts/pahole-flags.sh
+@@ -20,4 +20,7 @@ if [ "${pahole_ver}" -ge "122" ]; then
+ 	extra_paholeopt="${extra_paholeopt} -j"
+ fi
+
++# temporary workaround to disable enum64
++extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
++
+ echo ${extra_paholeopt}
 diff --git a/scripts/tags.sh b/scripts/tags.sh
 index e137cf15aae9..2ed2341f7967 100755
 --- a/scripts/tags.sh
diff --git a/sources b/sources
index ae6285bc5..d4e48f265 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
-SHA512 (linux-6.1.1.tar.xz) = db479d4a0642b5ccec8a7d2ef119f550e5bfa7a38f43268617ae913abd0cef165ff0d189f043b1d0b6760ee297004808fdfe19db59f5044030898b90d8b28f45
-SHA512 (kernel-abi-stablelists-6.1.1.tar.bz2) = df0c5476b66317dfd73967e75488caf66bebc07f9fcde9062b8827c495e74b437a8aba18fddcff37baaceb4e0356a86121e87d9f41c4b0d9d6791b5d06a1c4e1
-SHA512 (kernel-kabi-dw-6.1.1.tar.bz2) = 37fe68479b8be9962791157863e2333877926afb953112cd6231e5261ee9c446953d822cd3934c0d920482c8405a5c271516d5fb2649d9353d8432dedc30fbe7
+SHA512 (linux-6.1.2.tar.xz) = 4a8503ad00b1077e67efa04c5050d14ba405b20adab561ebf8813ff51323721c404f80a8ca058cc04277ef96a33bd1cd544e1cda6184c5e538e1e785586ab683
+SHA512 (kernel-abi-stablelists-6.1.2.tar.bz2) = dc72c5973f9348a553e3188b8d96493a3e8ce4cfb556a1ae181b9479cc3e3a6b950ea98890b1383992cf4e62b54c7cc5fcde6ba70f1847ad695a6a3df88fce43
+SHA512 (kernel-kabi-dw-6.1.2.tar.bz2) = 08c73581b9b83c1af371d6326b1e7e4924d888c4df6ccb6cfb94cd3921d85e9f879ca63a6051e019a98742912aee7ea7bb2c332cfa510ffd02997bdf714f8184