From 2faec5877e1b83407885ee4fa14b33aa1de283e6dc17c6b6e01efd08bc73563f Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 15 Dec 2022 09:40:48 +0000 Subject: [PATCH] commit 52313a417793a9464901e2ec6488702caf3070eb OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1849 --- dtb-aarch64.changes | 6 ++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 6 ++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 6 ++++++ dtb-armv7l.spec | 2 +- dtb-riscv64.changes | 6 ++++++ dtb-riscv64.spec | 2 +- kernel-64kb.changes | 6 ++++++ kernel-64kb.spec | 8 ++++---- kernel-debug.changes | 6 ++++++ kernel-debug.spec | 8 ++++---- kernel-default.changes | 6 ++++++ kernel-default.spec | 8 ++++---- kernel-docs.changes | 6 ++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 6 ++++++ kernel-kvmsmall.spec | 8 ++++---- kernel-lpae.changes | 6 ++++++ kernel-lpae.spec | 8 ++++---- kernel-obs-build.changes | 6 ++++++ kernel-obs-build.spec | 4 ++-- kernel-obs-qa.changes | 6 ++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 6 ++++++ kernel-pae.spec | 8 ++++---- kernel-source.changes | 6 ++++++ kernel-source.spec | 4 ++-- kernel-syms.changes | 6 ++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 6 ++++++ kernel-vanilla.spec | 8 ++++---- kernel-zfcpdump.changes | 6 ++++++ kernel-zfcpdump.spec | 8 ++++---- patches.suse.tar.bz2 | 4 ++-- series.conf | 1 + source-timestamp | 4 ++-- 37 files changed, 152 insertions(+), 49 deletions(-) diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 903dea05..ae04e77a 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index bd216d38..9d8f123c 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 903dea05..ae04e77a 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index 1be37648..50f6d10f 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 903dea05..ae04e77a 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index 43fca24a..147f20b3 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes index 903dea05..ae04e77a 100644 --- a/dtb-riscv64.changes +++ b/dtb-riscv64.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec index 621e335d..f1dc8cfa 100644 --- a/dtb-riscv64.spec +++ b/dtb-riscv64.spec @@ -31,7 +31,7 @@ Name: dtb-riscv64 Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 903dea05..ae04e77a 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 0e3d2683..8cd37194 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-debug.changes b/kernel-debug.changes index 903dea05..ae04e77a 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index d9c82e94..466a2577 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 diff --git a/kernel-default.changes b/kernel-default.changes index 903dea05..ae04e77a 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index ee24746b..23a87052 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 diff --git a/kernel-docs.changes b/kernel-docs.changes index 903dea05..ae04e77a 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index b1bef60a..a9ed164a 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0-only Group: Documentation/Man Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -67,7 +67,7 @@ BuildRequires: texlive-zapfding %endif URL: https://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 903dea05..ae04e77a 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index 397be00f..9cba3684 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 903dea05..ae04e77a 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 1448637a..49004827 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 903dea05..ae04e77a 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index 7fced7f6..6bcaee8f 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -45,7 +45,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +BuildRequires: kernel%kernel_flavor-srchash-52313a417793a9464901e2ec6488702caf3070eb %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0-only Group: SLES Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 903dea05..ae04e77a 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 6277d39d..eebe286c 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0-only Group: SLES Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 903dea05..ae04e77a 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 4443b2b5..d53bf6d8 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 diff --git a/kernel-source.changes b/kernel-source.changes index 903dea05..ae04e77a 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index e0512214..d82a28f0 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -33,7 +33,7 @@ Name: kernel-source Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -50,7 +50,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz diff --git a/kernel-syms.changes b/kernel-syms.changes index 903dea05..ae04e77a 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index dad076c9..dce859b8 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 6.1.0 %if %using_buildservice %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -52,7 +52,7 @@ Requires: kernel-pae-devel = %version-%source_rel %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 903dea05..ae04e77a 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index cfe49143..f3f31eaf 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 903dea05..ae04e77a 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 10:39:51 CET 2022 - jslaby@suse.cz + +- Revert "mm: add merging after mremap resize" (bsc#1206335). +- commit 52313a4 + ------------------------------------------------------------------- Mon Dec 12 09:43:43 CET 2022 - jslaby@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 7fbd4d97..16b947c1 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.1.0 %if 0%{?is_kotd} -Release: .gc3232e1 +Release: .g52313a4 %else Release: 0 %endif @@ -240,10 +240,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af -Provides: kernel-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: kernel-%build_flavor-base-srchash-52313a417793a9464901e2ec6488702caf3070eb +Provides: kernel-srchash-52313a417793a9464901e2ec6488702caf3070eb # END COMMON DEPS -Provides: %name-srchash-c3232e18d83f71a2fddeb5f175160863e6b171af +Provides: %name-srchash-52313a417793a9464901e2ec6488702caf3070eb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index ab880817..a9330b7f 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:529f055b9a54f37073efa12ff0dd043e9cde888b3224797093ad95c45e8b2a96 -size 35338 +oid sha256:18579cf85a9e5993b0ebad659f20a30ce5b64f587b2f21efe462447aa5e08f06 +size 36777 diff --git a/series.conf b/series.conf index 308e618b..8977d697 100644 --- a/series.conf +++ b/series.conf @@ -77,6 +77,7 @@ patches.suse/char-pcmcia-scr24x_cs-Fix-use-after-free-in-scr24x_f.patch patches.suse/char-xillybus-Prevent-use-after-free-due-to-race-con.patch patches.suse/char-xillybus-Fix-trivial-bug-with-mutex.patch + patches.suse/Revert-mm-add-merging-after-mremap-resize.patch ######################################################## # kbuild/module infrastructure fixes diff --git a/source-timestamp b/source-timestamp index 89be39e2..6baaf1ea 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2022-12-12 08:46:53 +0000 -GIT Revision: c3232e18d83f71a2fddeb5f175160863e6b171af +2022-12-15 09:39:51 +0000 +GIT Revision: 52313a417793a9464901e2ec6488702caf3070eb GIT Branch: stable