forked from rpms/kernel
		
	kernel-5.15-0.rc6.47
* Mon Oct 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.47] - Temporarily turn off selftests for bpf on ppc (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
		
							parent
							
								
									54b49e5218
								
							
						
					
					
						commit
						9d0424b3fb
					
				| @ -12,7 +12,7 @@ RHEL_MINOR = 99 | |||||||
| #
 | #
 | ||||||
| # Use this spot to avoid future merge conflicts.
 | # Use this spot to avoid future merge conflicts.
 | ||||||
| # Do not trim this comment.
 | # Do not trim this comment.
 | ||||||
| RHEL_RELEASE = 44 | RHEL_RELEASE = 47 | ||||||
| 
 | 
 | ||||||
| #
 | #
 | ||||||
| # Early y+1 numbering
 | # Early y+1 numbering
 | ||||||
|  | |||||||
| @ -4472,7 +4472,8 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y | |||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
| # CONFIG_QCOM_RPMH is not set | # CONFIG_QCOM_RPMH is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
|  | CONFIG_QCOM_SCM=y | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| # CONFIG_QCOM_SPMI_VADC is not set | # CONFIG_QCOM_SPMI_VADC is not set | ||||||
| @ -5376,7 +5377,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4450,7 +4450,8 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y | |||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
| # CONFIG_QCOM_RPMH is not set | # CONFIG_QCOM_RPMH is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
|  | CONFIG_QCOM_SCM=y | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| # CONFIG_QCOM_SPMI_VADC is not set | # CONFIG_QCOM_SPMI_VADC is not set | ||||||
| @ -5354,7 +5355,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4265,6 +4265,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y | |||||||
| CONFIG_QCOM_QDF2400_ERRATUM_0065=y | CONFIG_QCOM_QDF2400_ERRATUM_0065=y | ||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
|  | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM is not set | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| @ -5158,7 +5159,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4247,6 +4247,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y | |||||||
| CONFIG_QCOM_QDF2400_ERRATUM_0065=y | CONFIG_QCOM_QDF2400_ERRATUM_0065=y | ||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
|  | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM is not set | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| @ -5140,7 +5141,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4199,6 +4199,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y | |||||||
| CONFIG_QCOM_QDF2400_ERRATUM_0065=y | CONFIG_QCOM_QDF2400_ERRATUM_0065=y | ||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
|  | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM is not set | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| @ -5105,7 +5106,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4181,6 +4181,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y | |||||||
| CONFIG_QCOM_QDF2400_ERRATUM_0065=y | CONFIG_QCOM_QDF2400_ERRATUM_0065=y | ||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
|  | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM is not set | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| @ -5087,7 +5088,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4204,6 +4204,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y | |||||||
| CONFIG_QCOM_QDF2400_ERRATUM_0065=y | CONFIG_QCOM_QDF2400_ERRATUM_0065=y | ||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
|  | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM is not set | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| @ -5115,7 +5116,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4443,6 +4443,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y | |||||||
| CONFIG_QCOM_QDF2400_ERRATUM_0065=y | CONFIG_QCOM_QDF2400_ERRATUM_0065=y | ||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
|  | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM is not set | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| @ -5333,7 +5334,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
| @ -4422,6 +4422,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y | |||||||
| CONFIG_QCOM_QDF2400_ERRATUM_0065=y | CONFIG_QCOM_QDF2400_ERRATUM_0065=y | ||||||
| # CONFIG_QCOM_QFPROM is not set | # CONFIG_QCOM_QFPROM is not set | ||||||
| # CONFIG_QCOM_RMTFS_MEM is not set | # CONFIG_QCOM_RMTFS_MEM is not set | ||||||
|  | # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set | ||||||
| # CONFIG_QCOM_SCM is not set | # CONFIG_QCOM_SCM is not set | ||||||
| # CONFIG_QCOM_SMEM is not set | # CONFIG_QCOM_SMEM is not set | ||||||
| # CONFIG_QCOM_SPMI_IADC is not set | # CONFIG_QCOM_SPMI_IADC is not set | ||||||
| @ -5312,7 +5313,7 @@ CONFIG_SND_HDA_CODEC_CA0132=m | |||||||
| CONFIG_SND_HDA_CODEC_CIRRUS=m | CONFIG_SND_HDA_CODEC_CIRRUS=m | ||||||
| CONFIG_SND_HDA_CODEC_CMEDIA=m | CONFIG_SND_HDA_CODEC_CMEDIA=m | ||||||
| CONFIG_SND_HDA_CODEC_CONEXANT=m | CONFIG_SND_HDA_CODEC_CONEXANT=m | ||||||
| # CONFIG_SND_HDA_CODEC_CS8409 is not set | CONFIG_SND_HDA_CODEC_CS8409=m | ||||||
| CONFIG_SND_HDA_CODEC_HDMI=m | CONFIG_SND_HDA_CODEC_HDMI=m | ||||||
| CONFIG_SND_HDA_CODEC_REALTEK=m | CONFIG_SND_HDA_CODEC_REALTEK=m | ||||||
| CONFIG_SND_HDA_CODEC_SI3054=m | CONFIG_SND_HDA_CODEC_SI3054=m | ||||||
|  | |||||||
							
								
								
									
										16
									
								
								kernel.spec
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								kernel.spec
									
									
									
									
									
								
							| @ -83,9 +83,9 @@ Summary: The Linux kernel | |||||||
| # Set debugbuildsenabled to 0 to not build a separate debug kernel, but | # Set debugbuildsenabled to 0 to not build a separate debug kernel, but | ||||||
| #  to build the base kernel using the debug configuration. (Specifying | #  to build the base kernel using the debug configuration. (Specifying | ||||||
| #  the --with-release option overrides this setting.) | #  the --with-release option overrides this setting.) | ||||||
| %define debugbuildsenabled 0 | %define debugbuildsenabled 1 | ||||||
| 
 | 
 | ||||||
| %global distro_build 0.rc5.20211015gitec681c53f8d2.44 | %global distro_build 0.rc6.47 | ||||||
| 
 | 
 | ||||||
| %if 0%{?fedora} | %if 0%{?fedora} | ||||||
| %define secure_boot_arch x86_64 | %define secure_boot_arch x86_64 | ||||||
| @ -130,13 +130,13 @@ Summary: The Linux kernel | |||||||
| 
 | 
 | ||||||
| %define rpmversion 5.15.0 | %define rpmversion 5.15.0 | ||||||
| %define patchversion 5.15 | %define patchversion 5.15 | ||||||
| %define pkgrelease 0.rc5.20211015gitec681c53f8d2.44 | %define pkgrelease 0.rc6.47 | ||||||
| 
 | 
 | ||||||
| # This is needed to do merge window version magic | # This is needed to do merge window version magic | ||||||
| %define patchlevel 15 | %define patchlevel 15 | ||||||
| 
 | 
 | ||||||
| # allow pkg_release to have configurable %%{?dist} tag | # allow pkg_release to have configurable %%{?dist} tag | ||||||
| %define specrelease 0.rc5.20211015gitec681c53f8d2.44%{?buildid}%{?dist} | %define specrelease 0.rc6.47%{?buildid}%{?dist} | ||||||
| 
 | 
 | ||||||
| %define pkg_release %{specrelease} | %define pkg_release %{specrelease} | ||||||
| 
 | 
 | ||||||
| @ -679,7 +679,7 @@ BuildRequires: lld | |||||||
| # exact git commit you can run | # exact git commit you can run | ||||||
| # | # | ||||||
| # xzcat -qq ${TARBALL} | git get-tar-commit-id | # xzcat -qq ${TARBALL} | git get-tar-commit-id | ||||||
| Source0: linux-5.15-rc5-126-gec681c53f8d2.tar.xz | Source0: linux-5.15-rc6.tar.xz | ||||||
| 
 | 
 | ||||||
| Source1: Makefile.rhelver | Source1: Makefile.rhelver | ||||||
| 
 | 
 | ||||||
| @ -1370,8 +1370,8 @@ ApplyOptionalPatch() | |||||||
|   fi |   fi | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| %setup -q -n kernel-5.15-rc5-126-gec681c53f8d2 -c | %setup -q -n kernel-5.15-rc6 -c | ||||||
| mv linux-5.15-rc5-126-gec681c53f8d2 linux-%{KVERREL} | mv linux-5.15-rc6 linux-%{KVERREL} | ||||||
| 
 | 
 | ||||||
| cd linux-%{KVERREL} | cd linux-%{KVERREL} | ||||||
| cp -a %{SOURCE1} . | cp -a %{SOURCE1} . | ||||||
| @ -2970,7 +2970,7 @@ fi | |||||||
| # | # | ||||||
| # | # | ||||||
| %changelog | %changelog | ||||||
| * Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.44] | * Mon Oct 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.47] | ||||||
| - Temporarily turn off selftests for bpf on ppc (Justin M. Forbes) | - Temporarily turn off selftests for bpf on ppc (Justin M. Forbes) | ||||||
| 
 | 
 | ||||||
| * Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.43] | * Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.43] | ||||||
|  | |||||||
| @ -141,7 +141,7 @@ index 000000000000..effb81d04bfd | |||||||
| +
 | +
 | ||||||
| +endmenu
 | +endmenu
 | ||||||
| diff --git a/Makefile b/Makefile
 | diff --git a/Makefile b/Makefile
 | ||||||
| index 4d0c0ed9236e..ca36f5a601f0 100644
 | index 91297670da8e..a94f22de77ad 100644
 | ||||||
| --- a/Makefile
 | --- a/Makefile
 | ||||||
| +++ b/Makefile
 | +++ b/Makefile
 | ||||||
| @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
 | @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
 | ||||||
| @ -1573,7 +1573,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644 | |||||||
| 
 | 
 | ||||||
|  err_netlink: |  err_netlink: | ||||||
| diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
 | diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
 | ||||||
| index 7712a8f78337..471f4ff4272a 100644
 | index f8dd664b2eda..0ff9ea8340e4 100644
 | ||||||
| --- a/drivers/nvme/host/core.c
 | --- a/drivers/nvme/host/core.c
 | ||||||
| +++ b/drivers/nvme/host/core.c
 | +++ b/drivers/nvme/host/core.c
 | ||||||
| @@ -262,6 +262,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
 | @@ -262,6 +262,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
 | ||||||
| @ -1640,7 +1640,7 @@ index 7712a8f78337..471f4ff4272a 100644 | |||||||
|  } |  } | ||||||
|  EXPORT_SYMBOL_GPL(nvme_complete_rq); |  EXPORT_SYMBOL_GPL(nvme_complete_rq); | ||||||
| diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
 | diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
 | ||||||
| index e8ccdd398f78..b77de74d3660 100644
 | index fba06618c6c2..a4d81de29e13 100644
 | ||||||
| --- a/drivers/nvme/host/multipath.c
 | --- a/drivers/nvme/host/multipath.c
 | ||||||
| +++ b/drivers/nvme/host/multipath.c
 | +++ b/drivers/nvme/host/multipath.c
 | ||||||
| @@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
 | @@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
 | ||||||
| @ -1676,7 +1676,7 @@ index e8ccdd398f78..b77de74d3660 100644 | |||||||
| 
 | 
 | ||||||
|  	spin_lock_irqsave(&ns->head->requeue_lock, flags); |  	spin_lock_irqsave(&ns->head->requeue_lock, flags); | ||||||
|  	for (bio = req->bio; bio; bio = bio->bi_next) |  	for (bio = req->bio; bio; bio = bio->bi_next) | ||||||
| @@ -816,8 +822,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 | @@ -814,8 +820,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 | ||||||
|  	int error = 0; |  	int error = 0; | ||||||
| 
 | 
 | ||||||
|  	/* check if multipath is enabled and we have the capability */ |  	/* check if multipath is enabled and we have the capability */ | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								sources
									
									
									
									
									
								
							| @ -1,3 +1,3 @@ | |||||||
| SHA512 (linux-5.15-rc5-126-gec681c53f8d2.tar.xz) = 808025df6120bec8b9dfb2148c0e1b43088763270d8404e2e14661b540c37c0d7943f55cd68e67f3761bcfe07c53960cc6753b1ce40347583be43d5a7a5630fb | SHA512 (linux-5.15-rc6.tar.xz) = 04671e42f2a5fc1c3c31a4a7d808b53f99ac9712a753c498a97150ff3b74becba13c75a0b99066f459d84bdda1d3372eb2703d913ce0ac35e48e6bdadecb9f18 | ||||||
| SHA512 (kernel-abi-stablelists-5.15.0-0.rc5.20211015gitec681c53f8d2.44.tar.bz2) = 7f4c092751f8e1dd8a942c1a6dc55ef6d4c4655b37bbb79066133fc1ad7475502cb13c3e201b0c10966aa53a2cdeca9dee25b23b653e60388301955f334ed007 | SHA512 (kernel-abi-stablelists-5.15.0-0.rc6.47.tar.bz2) = 01317b052d6024907eed74bc6e4543ad8fe2dc3ccc08097d34eeaa6ccc747ef2d6ac119b8939ab9602826b1081f6b50b3624193d9039d9a73e3f2d56fbb9f973 | ||||||
| SHA512 (kernel-kabi-dw-5.15.0-0.rc5.20211015gitec681c53f8d2.44.tar.bz2) = 27f426e9471f33e0ce85bc1890f320ff32e1767a2024f4d5a2994e1627fd8b60c3b238b2bfdaccb79d15e23d507515986bd305579d1d785fd22b390177abb605 | SHA512 (kernel-kabi-dw-5.15.0-0.rc6.47.tar.bz2) = b0a77f19a3d9938073300eeec99c7d74be2772860f841b04f8e9c2859c040e4261494450954dd6f6c797530230db8cd2c59151cb321412c72b8f4bb067280c1d | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user