diff --git a/config.tar.bz2 b/config.tar.bz2
index 4c8b5ef4..bd3d083d 100644
--- a/config.tar.bz2
+++ b/config.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f21e2f0c01554e7f18e789f07089dc84f4b8f4e0fff08199828067640330afe
-size 293425
+oid sha256:dbfd15fd02b4048711ea14d3ab4e71c03be03766bdb3affd7ea92ea99e4176e6
+size 293440
diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes
index d25b7b04..99eee0ff 100644
--- a/dtb-aarch64.changes
+++ b/dtb-aarch64.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec
index 149c76a2..7c2cee59 100644
--- a/dtb-aarch64.spec
+++ b/dtb-aarch64.spec
@@ -31,7 +31,7 @@
 Name:           dtb-aarch64
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes
index d25b7b04..99eee0ff 100644
--- a/dtb-armv6l.changes
+++ b/dtb-armv6l.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec
index 0d99fe9b..bb540e1f 100644
--- a/dtb-armv6l.spec
+++ b/dtb-armv6l.spec
@@ -31,7 +31,7 @@
 Name:           dtb-armv6l
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes
index d25b7b04..99eee0ff 100644
--- a/dtb-armv7l.changes
+++ b/dtb-armv7l.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec
index 4f87279f..d05d17d4 100644
--- a/dtb-armv7l.spec
+++ b/dtb-armv7l.spec
@@ -31,7 +31,7 @@
 Name:           dtb-armv7l
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes
index d25b7b04..99eee0ff 100644
--- a/dtb-riscv64.changes
+++ b/dtb-riscv64.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec
index c2819365..ab6a2473 100644
--- a/dtb-riscv64.spec
+++ b/dtb-riscv64.spec
@@ -31,7 +31,7 @@
 Name:           dtb-riscv64
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
diff --git a/kernel-64kb.changes b/kernel-64kb.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-64kb.changes
+++ b/kernel-64kb.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-64kb.spec b/kernel-64kb.spec
index 0cbe2b8b..c9ab4709 100644
--- a/kernel-64kb.spec
+++ b/kernel-64kb.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %obsolete_rebuilds %name
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
 Source3:        kernel-source.rpmlintrc
@@ -377,7 +377,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  aarch64
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1241,7 +1240,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        Kernel with 64kb PAGE_SIZE - Unsupported kernel modules
@@ -1307,7 +1305,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1371,7 +1368,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1387,7 +1383,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1404,7 +1399,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1453,7 +1447,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1490,7 +1483,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1559,7 +1551,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1608,7 +1599,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1657,7 +1647,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1721,7 +1710,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1771,7 +1759,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1820,7 +1807,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in
index 6efd0aff..2bb1358e 100644
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@@ -247,7 +247,6 @@ Provides:       %name-srchash-@COMMIT_FULL@
 %obsolete_rebuilds %name
 @SOURCES@
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  @ARCHS@
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1108,7 +1107,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        @SUMMARY@ - Unsupported kernel modules
@@ -1172,7 +1170,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1234,7 +1231,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1250,7 +1246,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1267,7 +1262,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1317,7 +1311,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1354,7 +1347,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1422,7 +1414,6 @@ Supplements:	packageand(%name:%@KMP_NAME@-%build_flavor)
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n @KMP_NAME@-%build_flavor -f @KMP_NAME@.files
-%defattr(-, root, root)
 # END KMP
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-debug.changes b/kernel-debug.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-debug.spec b/kernel-debug.spec
index d91cf2e8..e497828f 100644
--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %ifarch ppc64
 Provides:       kernel-kdump = 2.6.28
 Obsoletes:      kernel-kdump <= 2.6.28
@@ -385,7 +385,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  aarch64 %ix86 ppc64 ppc64le x86_64
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1247,7 +1246,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        A Debug Version of the Kernel - Unsupported kernel modules
@@ -1315,7 +1313,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1381,7 +1378,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1397,7 +1393,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1414,7 +1409,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1467,7 +1461,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1504,7 +1497,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1573,7 +1565,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1622,7 +1613,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1671,7 +1661,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1735,7 +1724,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1785,7 +1773,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1834,7 +1821,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-default.changes b/kernel-default.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-default.changes
+++ b/kernel-default.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-default.spec b/kernel-default.spec
index bffb9148..04beb851 100644
--- a/kernel-default.spec
+++ b/kernel-default.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %ifarch %ix86
 Provides:       kernel-smp = 2.6.17
 Obsoletes:      kernel-smp <= 2.6.17
@@ -429,7 +429,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1290,7 +1289,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        The Standard Kernel - Unsupported kernel modules
@@ -1377,7 +1375,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1462,7 +1459,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1478,7 +1474,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1495,7 +1490,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1568,7 +1562,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1605,7 +1598,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1674,7 +1666,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1723,7 +1714,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1772,7 +1762,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1836,7 +1825,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1886,7 +1874,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1935,7 +1922,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-docs.changes b/kernel-docs.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-docs.spec b/kernel-docs.spec
index 468a55ad..e10cd7bf 100644
--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@@ -33,7 +33,7 @@ License:        GPL-2.0-only
 Group:          Documentation/Man
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -67,9 +67,8 @@ BuildRequires:  texlive-zapfding
 %endif
 URL:            https://www.kernel.org/
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
 Source3:        kernel-source.rpmlintrc
 Source14:       series.conf
@@ -264,7 +263,6 @@ done
 %endif
 
 %files
-%defattr(-,root,root)
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
 %doc COPYING
 %else
@@ -274,7 +272,6 @@ done
 
 %if %build_pdf
 %files pdf
-%defattr(-,root,root)
 %dir %{_datadir}/doc/kernel
 %docdir %{_datadir}/doc/kernel/pdf
 %{_datadir}/doc/kernel/pdf
@@ -282,7 +279,6 @@ done
 
 %if %build_html
 %files html
-%defattr(-,root,root)
 %dir %{_datadir}/doc/kernel
 %docdir %{_datadir}/doc/kernel/html
 %{_datadir}/doc/kernel/html
diff --git a/kernel-docs.spec.in b/kernel-docs.spec.in
index 0a1318c0..47761bda 100644
--- a/kernel-docs.spec.in
+++ b/kernel-docs.spec.in
@@ -69,7 +69,6 @@ URL:            https://www.kernel.org/
 Provides:       %name = %version-%source_rel
 Provides:       %name-srchash-@COMMIT_FULL@
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 @SOURCES@
 
 %description
@@ -132,7 +131,6 @@ done
 %endif
 
 %files
-%defattr(-,root,root)
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
 %doc COPYING
 %else
@@ -142,7 +140,6 @@ done
 
 %if %build_pdf
 %files pdf
-%defattr(-,root,root)
 %dir %{_datadir}/doc/kernel
 %docdir %{_datadir}/doc/kernel/pdf
 %{_datadir}/doc/kernel/pdf
@@ -150,7 +147,6 @@ done
 
 %if %build_html
 %files html
-%defattr(-,root,root)
 %dir %{_datadir}/doc/kernel
 %docdir %{_datadir}/doc/kernel/html
 %{_datadir}/doc/kernel/html
diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-kvmsmall.changes
+++ b/kernel-kvmsmall.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec
index 410767a0..85bb066a 100644
--- a/kernel-kvmsmall.spec
+++ b/kernel-kvmsmall.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %obsolete_rebuilds %name
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
 Source3:        kernel-source.rpmlintrc
@@ -377,7 +377,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  aarch64 ppc64 ppc64le x86_64
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1245,7 +1244,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        The Small Developer Kernel for KVM - Unsupported kernel modules
@@ -1315,7 +1313,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1383,7 +1380,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1399,7 +1395,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1416,7 +1411,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1465,7 +1459,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1502,7 +1495,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1571,7 +1563,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1620,7 +1611,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1669,7 +1659,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1733,7 +1722,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1783,7 +1771,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1832,7 +1819,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-lpae.changes b/kernel-lpae.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-lpae.changes
+++ b/kernel-lpae.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-lpae.spec b/kernel-lpae.spec
index 9a9bec98..e2b11879 100644
--- a/kernel-lpae.spec
+++ b/kernel-lpae.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %obsolete_rebuilds %name
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
 Source3:        kernel-source.rpmlintrc
@@ -377,7 +377,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  armv7hl
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1239,7 +1238,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        Kernel for LPAE enabled systems - Unsupported kernel modules
@@ -1303,7 +1301,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1365,7 +1362,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1381,7 +1377,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1398,7 +1393,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1447,7 +1441,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1484,7 +1477,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1553,7 +1545,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1602,7 +1593,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1651,7 +1641,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1715,7 +1704,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1765,7 +1753,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1814,7 +1801,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-obs-build.changes
+++ b/kernel-obs-build.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec
index 5d15a881..c8bd594f 100644
--- a/kernel-obs-build.spec
+++ b/kernel-obs-build.spec
@@ -44,7 +44,7 @@ BuildRequires:  util-linux
 %endif
 %endif
 %endif
-BuildRequires:  kernel%kernel_flavor-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+BuildRequires:  kernel%kernel_flavor-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 
 %if 0%{?rhel_version}
 BuildRequires:  kernel
@@ -58,7 +58,7 @@ License:        GPL-2.0-only
 Group:          SLES
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-obs-qa.changes
+++ b/kernel-obs-qa.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec
index 81c05304..b82c3f92 100644
--- a/kernel-obs-qa.spec
+++ b/kernel-obs-qa.spec
@@ -29,16 +29,12 @@ BuildRequires:  kernel-default
 BuildRequires:  kernel-obs-build
 BuildRequires:  modutils
 ExclusiveArch:  aarch64 armv6hl armv7hl ppc64 ppc64le riscv64 s390x x86_64
-%if 0%{?suse_version} < 1200
-# for SLE 11
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
 Summary:        Basic QA tests for the kernel
 License:        GPL-2.0-only
 Group:          SLES
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -71,7 +67,6 @@ mkdir -p %{buildroot}/usr/share/%name
 touch %{buildroot}/usr/share/%name/logfile
 
 %files
-%defattr(-,root,root)
 /usr/share/%name
 
 %changelog
diff --git a/kernel-obs-qa.spec.in b/kernel-obs-qa.spec.in
index 24f58022..76ef1455 100644
--- a/kernel-obs-qa.spec.in
+++ b/kernel-obs-qa.spec.in
@@ -29,10 +29,6 @@ BuildRequires:  kernel-default
 BuildRequires:  kernel-obs-build
 BuildRequires:  modutils
 ExclusiveArch:  @ARCHS@
-%if 0%{?suse_version} < 1200
-# for SLE 11
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
 Summary:        Basic QA tests for the kernel
 License:        GPL-2.0-only
 Group:          SLES
@@ -71,7 +67,6 @@ mkdir -p %{buildroot}/usr/share/%name
 touch %{buildroot}/usr/share/%name/logfile
 
 %files
-%defattr(-,root,root)
 /usr/share/%name
 
 %changelog
diff --git a/kernel-pae.changes b/kernel-pae.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-pae.spec b/kernel-pae.spec
index 481a1024..9de051c8 100644
--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %ifarch %ix86
 Provides:       kernel-bigsmp = 2.6.17
 Obsoletes:      kernel-bigsmp <= 2.6.17
@@ -399,7 +399,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1267,7 +1266,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        Kernel with PAE Support - Unsupported kernel modules
@@ -1347,7 +1345,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1425,7 +1422,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1441,7 +1437,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1458,7 +1453,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1517,7 +1511,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1554,7 +1547,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1623,7 +1615,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1672,7 +1663,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1721,7 +1711,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1785,7 +1774,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1835,7 +1823,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1884,7 +1871,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-source.changes b/kernel-source.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-source.spec b/kernel-source.spec
index e3801823..5ba11e0d 100644
--- a/kernel-source.spec
+++ b/kernel-source.spec
@@ -32,7 +32,7 @@
 Name:           kernel-source
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -49,7 +49,7 @@ BuildRequires:  fdupes
 BuildRequires:  sed
 Requires(post): coreutils sed
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 Provides:       linux
 Provides:       multiversion(kernel)
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@@ -303,16 +303,13 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant
 relink linux-%kernelrelease%variant /usr/src/linux%variant
 
 %files -f nondevel.files
-%defattr(-, root, root)
 
 %files -n kernel-devel%variant -f devel.files
-%defattr(-,root,root)
 %ghost /usr/src/linux%variant
 %doc /usr/share/doc/packages/*
 
 %if "%variant" == ""
 %files -n kernel-macros
-%defattr(-,root,root)
 %{_rpmmacrodir}/macros.kernel-source
 /usr/lib/rpm/kernel-*-subpackage
 %dir /usr/lib/rpm/kernel
@@ -323,7 +320,6 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant
 %if %do_vanilla
 
 %files vanilla
-%defattr(-, root, root)
 /usr/src/linux-%kernelrelease-vanilla
 %endif
 
diff --git a/kernel-source.spec.in b/kernel-source.spec.in
index 748062b3..5ad0dd65 100644
--- a/kernel-source.spec.in
+++ b/kernel-source.spec.in
@@ -303,16 +303,13 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant
 relink linux-%kernelrelease%variant /usr/src/linux%variant
 
 %files -f nondevel.files
-%defattr(-, root, root)
 
 %files -n kernel-devel%variant -f devel.files
-%defattr(-,root,root)
 %ghost /usr/src/linux%variant
 %doc /usr/share/doc/packages/*
 
 %if "%variant" == ""
 %files -n kernel-macros
-%defattr(-,root,root)
 %{_rpmmacrodir}/macros.kernel-source
 /usr/lib/rpm/kernel-*-subpackage
 %dir /usr/lib/rpm/kernel
@@ -323,7 +320,6 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant
 %if %do_vanilla
 
 %files vanilla
-%defattr(-, root, root)
 /usr/src/linux-%kernelrelease-vanilla
 %endif
 
diff --git a/kernel-spec-macros b/kernel-spec-macros
index af6a69cc..affe4486 100644
--- a/kernel-spec-macros
+++ b/kernel-spec-macros
@@ -30,15 +30,17 @@
 %define obsolete_rebuilds() %( \
 	set -- $(echo %release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \
 	if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \
-	seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \
+	for i in $(seq 1 $(($2-1))) ; do echo "Obsoletes: %1 = %version-$1$i$3" ; done \
 )
-%define obsolete_rebuilds_subpackage() %( %{verbose:set -x} \
+%define obsolete_rebuilds_subpackage() %( \
 	set -- $(echo %release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \
 	if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \
-	seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \
+	cnt=$2
 	set -- $(echo %source_rel | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \
-	if test -n "$2" && test "$2" -gt 99; then echo "warning: Upload counter too high in %release" >&2; exit 0; fi \
-	seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \
+	if test -n "$2" && test "$2" -gt 99; then echo "warning: Upload counter too high in %source_rel" >&2; exit 0; fi \
+	for i in $(seq 1 $2) ; do for j in $(seq 1 $cnt) ; do [ $i = $2 ] && [ $j = $cnt ] && break \
+		echo "Obsoletes: %1 = %version-$1$i.$j$3" \
+	done ; done \
 )
 %endif
 
diff --git a/kernel-syms.changes b/kernel-syms.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-syms.spec b/kernel-syms.spec
index c2700263..1c2f059f 100644
--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@@ -27,7 +27,7 @@ Group:          Development/Sources
 Version:        6.3.1
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -52,11 +52,10 @@ Requires:       kernel-pae-devel = %version-%source_rel
 %endif
 Requires:       pesign-obs-integration
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 Provides:       multiversion(kernel)
 Source:         README.KSYMS
 Requires:       kernel-devel%variant = %version-%source_rel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 aarch64 armv6hl armv7hl ppc64 ppc64le riscv64 s390x x86_64
 Prefix:         /usr/src
 
@@ -81,7 +80,6 @@ package dependencies.
 install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 
 %files
-%defattr(-, root, root)
 %dir %_docdir/%name
 %_docdir/%name/README.SUSE
 
diff --git a/kernel-syms.spec.in b/kernel-syms.spec.in
index a72e9059..cfec9303 100644
--- a/kernel-syms.spec.in
+++ b/kernel-syms.spec.in
@@ -45,7 +45,6 @@ Provides:       %name-srchash-@COMMIT_FULL@
 Provides:       multiversion(kernel)
 Source:         README.KSYMS
 Requires:       kernel-devel%variant = %version-%source_rel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  @ARCHS@
 Prefix:         /usr/src
 
@@ -70,7 +69,6 @@ package dependencies.
 install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 
 %files
-%defattr(-, root, root)
 %dir %_docdir/%name
 %_docdir/%name/README.SUSE
 
diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 74fce1b1..0a974d25 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %obsolete_rebuilds %name
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
 Source3:        kernel-source.rpmlintrc
@@ -377,7 +377,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1238,7 +1237,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        The Standard Kernel - without any SUSE patches - Unsupported kernel modules
@@ -1301,7 +1299,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1362,7 +1359,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1378,7 +1374,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1395,7 +1390,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1444,7 +1438,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1481,7 +1474,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1550,7 +1542,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1599,7 +1590,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1648,7 +1638,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1712,7 +1701,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1762,7 +1750,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1811,7 +1798,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes
index d25b7b04..99eee0ff 100644
--- a/kernel-zfcpdump.changes
+++ b/kernel-zfcpdump.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue May  9 08:08:50 CEST 2023 - jslaby@suse.cz
+
+- Revert "Update config files." (bsc#1211166)
+  This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b.
+  Lockdown is not ready and was disabled in stable. Since this is still
+  not resolved in 6.3/6.4-rc, let's disable it in master completely too.
+  And let's retry once everything is ready.
+- commit 944713a
+
+-------------------------------------------------------------------
+Fri May  5 15:03:15 CEST 2023 - msuchanek@suse.de
+
+- Remove obsolete rpm spec constructs
+  defattr does not need to be specified anymore
+  buildroot does not need to be specified anymore
+- commit c963185
+
+-------------------------------------------------------------------
+Fri May  5 13:15:09 CEST 2023 - msuchanek@suse.de
+
+- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate
+  obsoletes correctly (boo#1172073 bsc#1191731).
+  rpm only supports full length release, no provides
+- commit c9b5bc4
+
 -------------------------------------------------------------------
 Thu May  4 16:48:11 CEST 2023 - msuchanek@suse.de
 
diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec
index 4a6712dd..c32a2e73 100644
--- a/kernel-zfcpdump.spec
+++ b/kernel-zfcpdump.spec
@@ -113,7 +113,7 @@ License:        GPL-2.0-only
 Group:          System/Kernel
 Version:        6.3.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g3621ae5
+Release:        <RELEASE>.g78ee477
 %else
 Release:        0
 %endif
@@ -238,10 +238,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
-Provides:       kernel-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
+Provides:       kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 # END COMMON DEPS
-Provides:       %name-srchash-3621ae5828bc59b92d1006304a2d71a320f69b7c
+Provides:       %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3
 %obsolete_rebuilds %name
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
 Source3:        kernel-source.rpmlintrc
@@ -377,7 +377,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  s390x
 %define kmp_target_cpu %_target_cpu
 %ifarch %ix86
@@ -1241,7 +1240,6 @@ fi
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
 %files -f kernel-main.files
-%defattr(-, root, root)
 
 %package extra
 Summary:        The IBM System Z zfcpdump Kernel - Unsupported kernel modules
@@ -1307,7 +1305,6 @@ This package contains additional modules not supported by SUSE.
 %if %split_extra
 
 %files extra -f kernel-extra.files
-%defattr(-, root, root)
 %endif
 
 %if %split_extra && %split_optional
@@ -1371,7 +1368,6 @@ This package contains optional modules only for openSUSE Leap.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files optional -f kernel-optional.files
-%defattr(-, root, root)
 %endif
 
 %if "%CONFIG_KMSG_IDS" == "y"
@@ -1387,7 +1383,6 @@ kmsg message documentation comments.
 
 %source_timestamp
 %files man
-%defattr(-,root,root)
 /usr/share/man/man9/*
 %endif
 
@@ -1404,7 +1399,6 @@ from this package.
 
 %source_timestamp
 %files vdso
-%defattr(-,root,root)
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
 
@@ -1453,7 +1447,6 @@ fi
 relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor"
 
 %files devel -f kernel-devel.files
-%defattr(-,root,root)
 %dir /usr/src/linux-obj
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
@@ -1490,7 +1483,6 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
 
 %files %{livepatch}
 # rpmlint complains about empty packages, so lets own something
-%defattr(-, root, root)
 %dir %modules_dir
 %endif
 
@@ -1559,7 +1551,6 @@ nodes in the cluster can access the MD devices simultaneously.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files
-%defattr(-, root, root)
 
 %package -n dlm-kmp-%build_flavor
 Summary:        DLM kernel modules
@@ -1608,7 +1599,6 @@ shared resources over the cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n dlm-kmp-%build_flavor -f dlm-kmp.files
-%defattr(-, root, root)
 
 %package -n gfs2-kmp-%build_flavor
 Summary:        GFS2 kernel modules
@@ -1657,7 +1647,6 @@ GFS2 is Global Filesystem, a shared device filesystem.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n kselftests-kmp-%build_flavor
 Summary:        Kernel sefltests
@@ -1721,7 +1710,6 @@ environments, they are not intended to be run on production systems.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files
-%defattr(-, root, root)
 
 %package -n ocfs2-kmp-%build_flavor
 Summary:        OCFS2 kernel modules
@@ -1771,7 +1759,6 @@ accessible simultaneously from multiple nodes of a cluster.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files
-%defattr(-, root, root)
 
 %package -n reiserfs-kmp-%build_flavor
 Summary:        Reiserfs kernel module
@@ -1820,7 +1807,6 @@ provides the reiserfs module for the installation system.
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 
 %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-%defattr(-, root, root)
 
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES
diff --git a/source-timestamp b/source-timestamp
index a7455fc5..a426aa5a 100644
--- a/source-timestamp
+++ b/source-timestamp
@@ -1,3 +1,3 @@
-2023-05-05 12:01:49 +0000
-GIT Revision: 3621ae5828bc59b92d1006304a2d71a320f69b7c
+2023-05-09 07:50:57 +0000
+GIT Revision: 78ee4774aa1081a539cf0d8188072e4783bcf3b3
 GIT Branch: stable