commit 1f711ff8ab64f2795893689a6ff38540373df5f5

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1554
2021-08-14 08:02:42 +00:00 · 2021-08-14 08:02:42 +00:00 · 7dbfcb6950
commit 7dbfcb6950
parent 31e68f71f7
36 changed files with 244 additions and 92 deletions
--- a/dtb-aarch64.changes
+++ b/dtb-aarch64.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/dtb-aarch64.spec
+++ b/dtb-aarch64.spec
@ -31,7 +31,7 @@
 Name:           dtb-aarch64
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
--- a/dtb-armv6l.changes
+++ b/dtb-armv6l.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/dtb-armv6l.spec
+++ b/dtb-armv6l.spec
@ -31,7 +31,7 @@
 Name:           dtb-armv6l
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
--- a/dtb-armv7l.changes
+++ b/dtb-armv7l.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/dtb-armv7l.spec
+++ b/dtb-armv7l.spec
@ -31,7 +31,7 @@
 Name:           dtb-armv7l
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
--- a/dtb-riscv64.changes
+++ b/dtb-riscv64.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/dtb-riscv64.spec
+++ b/dtb-riscv64.spec
@ -31,7 +31,7 @@
 Name:           dtb-riscv64
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
--- a/kernel-64kb.changes
+++ b/kernel-64kb.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-64kb.spec
+++ b/kernel-64kb.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %ifarch ppc64
 Provides:       kernel-kdump = 2.6.28
 Obsoletes:      kernel-kdump <= 2.6.28
--- a/kernel-default.changes
+++ b/kernel-default.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-default.spec
+++ b/kernel-default.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %ifarch %ix86
 Provides:       kernel-smp = 2.6.17
 Obsoletes:      kernel-smp <= 2.6.17
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@ -33,7 +33,7 @@ License:        GPL-2.0-only
 Group:          Documentation/Man
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -64,7 +64,7 @@ BuildRequires:  texlive-zapfding
 %endif
 Url:            http://www.kernel.org/
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
--- a/kernel-kvmsmall.changes
+++ b/kernel-kvmsmall.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-kvmsmall.spec
+++ b/kernel-kvmsmall.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-lpae.changes
+++ b/kernel-lpae.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-lpae.spec
+++ b/kernel-lpae.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-obs-build.changes
+++ b/kernel-obs-build.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- 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-37b568f54b08141caacbdd7423dabaa2d20f8796
+BuildRequires:  kernel%kernel_flavor-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5

 %if 0%{?rhel_version}
 BuildRequires:  kernel
@ -66,7 +66,7 @@ License:        GPL-2.0-only
 Group:          SLES
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
--- a/kernel-obs-qa.changes
+++ b/kernel-obs-qa.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-obs-qa.spec
+++ b/kernel-obs-qa.spec
@ -38,7 +38,7 @@ License:        GPL-2.0-only
 Group:          SLES
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %ifarch %ix86
 Provides:       kernel-bigsmp = 2.6.17
 Obsoletes:      kernel-bigsmp <= 2.6.17
--- a/kernel-source.changes
+++ b/kernel-source.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-source.spec
+++ b/kernel-source.spec
@ -32,7 +32,7 @@ License:        GPL-2.0-only
 Group:          Development/Sources
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -43,7 +43,7 @@ BuildRequires:  fdupes
 BuildRequires:  sed
 Requires(post): coreutils sed
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 Provides:       linux
 Provides:       multiversion(kernel)
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@ -27,7 +27,7 @@ Group:          Development/Sources
 Version:        5.13.10
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %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-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 Provides:       multiversion(kernel)
 Source:         README.KSYMS
 Requires:       kernel-devel%variant = %version-%source_rel
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-zfcpdump.changes
+++ b/kernel-zfcpdump.changes
@ -326,6 +326,16 @@ Wed Aug 11 06:36:51 CEST 2021 - jslaby@suse.cz
  adressed in the meantime, so it's time to try UsrMerge for kernel again.
 - commit 2e9639b

+-------------------------------------------------------------------
+Mon Aug  9 13:13:03 CEST 2021 - ludwig.nussel@suse.de
+
+- Fix filesystem requirement and suse-release requires
+  Reduce filesystem conflict to anything less than 16 to allow pulling the
+  change into the next major stable version.
+  Don't require suse-release as that's not technically required. Conflict
+  with a too old one instead.
+- commit 913f755
+
 -------------------------------------------------------------------
 Sun Aug  8 12:50:22 CEST 2021 - jslaby@suse.cz

--- a/kernel-zfcpdump.spec
+++ b/kernel-zfcpdump.spec
@ -88,7 +88,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        5.13.10
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g37b568f
+Release:        <RELEASE>.g1f711ff
 %else
 Release:        0
 %endif
@ -175,11 +175,9 @@ BuildRequires:  dwarfextract
 BuildRequires:  u-boot-tools
 %endif
 %if 0%{?usrmerged}
-# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently
-Conflicts:      filesystem < 84
-# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge
-# FIXME: microos in stagings doesn't provide such a high release
-#Requires:       suse-release > 20210602
+# make sure we have a post-usrmerge system
+Conflicts:      filesystem < 16
+Conflicts:      suse-release < 16
 %endif

 Obsoletes:      microcode_ctl
@ -206,10 +204,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
-Provides:       kernel-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       kernel-%build_flavor-base-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
+Provides:       kernel-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 # END COMMON DEPS
-Provides:       %name-srchash-37b568f54b08141caacbdd7423dabaa2d20f8796
+Provides:       %name-srchash-1f711ff8ab64f2795893689a6ff38540373df5f5
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-2021-08-13 04:16:18 +0000
-GIT Revision: 37b568f54b08141caacbdd7423dabaa2d20f8796
+2021-08-13 07:58:03 +0000
+GIT Revision: 1f711ff8ab64f2795893689a6ff38540373df5f5
 GIT Branch: stable