kernel-6.0.12-300

* Thu Dec 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.12-0] - Add new config option for 6.0.12 backport (Justin M. Forbes) - Linux v6.0.12 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2022-12-08 10:23:04 -06:00 · 2022-12-08 10:23:04 -06:00 · 7bb5e452ee
commit 7bb5e452ee
parent 9c5e4c2e29
24 changed files with 36 additions and 51 deletions
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -2394,6 +2394,7 @@ CONFIG_FTRACE=y
 # CONFIG_FTWDT010_WATCHDOG is not set
 CONFIG_FUJITSU_ERRATUM_010001=y
 # CONFIG_FUJITSU_ES is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -1828,6 +1828,7 @@ CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 # CONFIG_FUJITSU_ES is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -2378,6 +2378,7 @@ CONFIG_FTRACE=y
 # CONFIG_FTWDT010_WATCHDOG is not set
 CONFIG_FUJITSU_ERRATUM_010001=y
 # CONFIG_FUJITSU_ES is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -1812,6 +1812,7 @@ CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 # CONFIG_FUJITSU_ES is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -2384,6 +2384,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTWDT010_WATCHDOG is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -2369,6 +2369,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTWDT010_WATCHDOG is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -2338,6 +2338,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTWDT010_WATCHDOG is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -2323,6 +2323,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTWDT010_WATCHDOG is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -1891,6 +1891,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -1665,6 +1665,7 @@ CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 CONFIG_FUJITSU_ERRATUM_010001=y
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -1874,6 +1874,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -1649,6 +1649,7 @@ CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 CONFIG_FUJITSU_ERRATUM_010001=y
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -1888,6 +1888,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -1668,6 +1668,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 CONFIG_FUJITSU_ERRATUM_010001=y
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -1871,6 +1871,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -1652,6 +1652,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 CONFIG_FUJITSU_ERRATUM_010001=y
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -1659,6 +1659,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FUJITSU_ERRATUM_010001=y
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -2056,6 +2056,7 @@ CONFIG_FTRACE=y
 CONFIG_FUJITSU_ES=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -1770,6 +1770,7 @@ CONFIG_FUJITSU_ERRATUM_010001=y
 CONFIG_FUJITSU_ES=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -2039,6 +2039,7 @@ CONFIG_FTRACE=y
 CONFIG_FUJITSU_ES=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -1754,6 +1754,7 @@ CONFIG_FUJITSU_ERRATUM_010001=y
 CONFIG_FUJITSU_ES=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FUNCTION_TRACER=y
--- a/kernel.spec
+++ b/kernel.spec
@ -122,17 +122,17 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specversion 6.0.11
+%define specversion 6.0.12
 %define patchversion 6.0
 %define pkgrelease 300
 %define kversion 6
-%define tarfile_release 6.0.11
+%define tarfile_release 6.0.12
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 300%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.0.11
+%define kabiversion 6.0.12

 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@ -3180,6 +3180,10 @@ fi
 #
 #
 %changelog
+* Thu Dec 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.12-0]
+- Add new config option for 6.0.12 backport (Justin M. Forbes)
+- Linux v6.0.12
+
 * Fri Dec 02 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.11-0]
 - drm/i915: fix TLB invalidation for Gen12 video and compute engines (Andrzej Hajda)
 - l2tp: Serialize access to sk_user_data with sk_callback_lock (Jakub Sitnicki)
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@ -38,7 +38,6 @@
 include/net/sock.h                                 |   2 +-
 init/Kconfig                                       |   2 +-
 kernel/module/signing.c                            |   9 +-
- net/ipv4/fib_semantics.c                           |   8 +-
 net/l2tp/l2tp_core.c                               |  19 +-
 scripts/pahole-flags.sh                            |   3 +
 scripts/tags.sh                                    |   2 +
@ -46,11 +45,10 @@
 security/lockdown/Kconfig                          |  13 +
 security/lockdown/lockdown.c                       |   1 +
 security/security.c                                |   6 +
- tools/testing/selftests/net/fib_nexthops.sh        |   5 +
- 49 files changed, 776 insertions(+), 369 deletions(-)
+ 47 files changed, 767 insertions(+), 365 deletions(-)

 diff --git a/Makefile b/Makefile
-index 9fecb094c28a..43753e41fb51 100644
+index 46c6eb57b354..ad3a206451ea 100644
 --- a/Makefile
 +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -1090,7 +1088,7 @@ index 3a808146b50f..c1a3f3057921 100644
  * Changes the default domain of an iommu group that has *only* one device
  *
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 01c36284e542..2a5fd205863b 100644
+index f612a0ba64d0..5c4a1ca36aec 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)
@ -1157,7 +1155,7 @@ index 01c36284e542..2a5fd205863b 100644
 #ifdef CONFIG_NVME_AUTH
 		queue_work(nvme_wq, &ctrl->dhchap_auth_work);
 diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index b9cf17cbbbd5..9aa33fc59f67 100644
+index 114e2b9359f8..30049e986fba 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@ -1193,7 +1191,7 @@ index b9cf17cbbbd5..9aa33fc59f67 100644

 	spin_lock_irqsave(&ns->head->requeue_lock, flags);
 	for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -872,8 +878,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -875,8 +881,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 	int error = 0;

 	/* check if multipath is enabled and we have the capability */
@ -1995,28 +1993,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644
 }

 int module_sig_check(struct load_info *info, int flags)
-diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index 2dc97583d279..e9a7f70a54df 100644
--- a/net/ipv4/fib_semantics.c
-+++ b/net/ipv4/fib_semantics.c
-@@ -888,13 +888,13 @@ int fib_nh_match(struct net *net, struct fib_config *cfg, struct fib_info *fi,
- 		return 1;
- 	}
-
-+	/* cannot match on nexthop object attributes */
-+	if (fi->nh)
-+		return 1;
-+
- 	if (cfg->fc_oif || cfg->fc_gw_family) {
- 		struct fib_nh *nh;
-
-		/* cannot match on nexthop object attributes */
-		if (fi->nh)
-			return 1;
-
- 		nh = fib_info_nh(fi, 0);
- 		if (cfg->fc_encap) {
- 			if (fib_encap_match(net, cfg->fc_encap_type,
 diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
 index 7499c51b1850..754fdda8a5f5 100644
 --- a/net/l2tp/l2tp_core.c
@ -2184,19 +2160,3 @@ index 4b95de24bc8d..10047790e96e 100644
 #ifdef CONFIG_PERF_EVENTS
 int security_perf_event_open(struct perf_event_attr *attr, int type)
 {
-diff --git a/tools/testing/selftests/net/fib_nexthops.sh b/tools/testing/selftests/net/fib_nexthops.sh
-index d5a0dd548989..ee5e98204d3d 100755
--- a/tools/testing/selftests/net/fib_nexthops.sh
-+++ b/tools/testing/selftests/net/fib_nexthops.sh
-@@ -1223,6 +1223,11 @@ ipv4_fcnal()
- 	log_test $rc 0 "Delete nexthop route warning"
- 	run_cmd "$IP route delete 172.16.101.1/32 nhid 12"
- 	run_cmd "$IP nexthop del id 12"
-+
-+	run_cmd "$IP nexthop add id 21 via 172.16.1.6 dev veth1"
-+	run_cmd "$IP ro add 172.16.101.0/24 nhid 21"
-+	run_cmd "$IP ro del 172.16.101.0/24 nexthop via 172.16.1.7 dev veth1 nexthop via 172.16.1.8 dev veth1"
-+	log_test $? 2 "Delete multipath route with only nh id based entry"
- }
-
- ipv4_grp_fcnal()
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.0.11.tar.xz) = 2adaf3d3fafcd3f2270a1fecfe9e3a94afde4fd769643a6805cedf6314b300b7ea85a0e7662f17de0a00c892f51f5ee86493307bbf511bbf7ec863e22cab2fb0
-SHA512 (kernel-abi-stablelists-6.0.11.tar.bz2) = 1129518b7b3bb9620c77f7d097c9d39ad7bd23ff5eabc3f29a27369a88191fdd10d18c459f9b19da0b27ad7378c48a0c6fe1cde93f5d378c405d6e2424c81ab2
-SHA512 (kernel-kabi-dw-6.0.11.tar.bz2) = f1a70345a71f4ae8177a582dc224bcf089dbd9e74dda33d98d2851f4827fc32a11733c3e6def9afacb1ad2d6d893325e35c4015eb917f57003c327855cd8f2f8
+SHA512 (linux-6.0.12.tar.xz) = ff62a8298825ca6a9f7cecbd93d3b5547e3f06d0b4ea08739173866a5a7a660debc1488ba488a5c219d7758cd1a793e61df9799ca62f4bc814ad5a66d5866069
+SHA512 (kernel-abi-stablelists-6.0.12.tar.bz2) = d8937c89b1e66af04ddfa038c72787e2dd25d93fd186c621a2877fd2c383cf6b867a4a3fb53ae9ff36f2ad426f10f6ae4815aea961e24c54430538b11c843b2e
+SHA512 (kernel-kabi-dw-6.0.12.tar.bz2) = 2789aa4dd989267e15aa602aac9e4a085584c4db2162b504d2c0c02c94661c0988466723167c96fe9c79e3828ce4e88dd5a0447ef7e284b3f8af01927802c9f1