Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at 2021-04-29 01:36:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Thu Apr 29 01:36:35 2021 rev:584 rq:888348 version:5.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
2021-04-25 21:25:58.680326205 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new.12324/dtb-aarch64.changes
2021-04-29 01:36:48.582443159 +0200
@@ -1,0 +2,29 @@
+Sun Apr 25 23:15:12 CEST 2021 - mkube...@suse.cz
+
+- Update to 5.12 final
+- refresh configs (headers only)
+- commit 9683115
+
+-------------------------------------------------------------------
+Sun Apr 25 13:19:40 CEST 2021 - msucha...@suse.de
+
+- rpm/kernel-binary.spec.in: Require new enough pahole.
+ pahole 1.21 is required for building line-next BTF
+- commit 8df1aaa
+
+-------------------------------------------------------------------
+Fri Apr 23 18:24:39 CEST 2021 - martin.wi...@suse.com
+
+- rpm/macros.kernel-source: fix KMP failure in %install (bsc#1185244)
+- commit 52805ed
+
+-------------------------------------------------------------------
+Thu Apr 22 18:26:15 CEST 2021 - msucha...@suse.de
+
+- rpm/kernel-obs-build.spec.in: Include essiv with dm-crypt (boo#1183063).
+ Previously essiv was part of dm-crypt but now it is separate.
+ Include the module in kernel-obs-build when available.
+ Fixes: 7cf5b9e26d87 ("rpm/kernel-obs-build.spec.in: add dm-crypt for
building with cryptsetup")
+- commit fe15b78
+
+-------------------------------------------------------------------
@@ -217,0 +247,7 @@
+Mon Apr 19 00:03:41 CEST 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc8
+- refresh configs
+- commit a71cb9a
+
+-------------------------------------------------------------------
@@ -621,0 +658,6 @@
+Mon Apr 12 00:31:38 CEST 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc7
+- commit bd61ada
+
+-------------------------------------------------------------------
@@ -966,0 +1009,13 @@
+Wed Apr 7 10:18:52 CEST 2021 - dmuel...@suse.com
+
+- config.conf: reenable armv6/armv7 configs
+ (all modules, otherwise same settings like arm64)
+- commit d115d63
+
+-------------------------------------------------------------------
+Wed Apr 7 09:51:47 CEST 2021 - dmuel...@suse.com
+
+- arm64: add debug config with KASAN enabled (bsc#1183716)
+- commit b68cba9
+
+-------------------------------------------------------------------
@@ -979,0 +1035,12 @@
+Tue Apr 6 11:28:47 CEST 2021 - dmuel...@suse.com
+
+- arm64: enable and update config for 5.12
+- commit 0a5586c
+
+-------------------------------------------------------------------
+Mon Apr 5 00:09:26 CEST 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc6
+- commit b5f88e6
+
+-------------------------------------------------------------------
@@ -1398,0 +1466,8 @@
+Mon Mar 29 01:26:17 CEST 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc5
+- refresh configs
+ - XEN_BALLOON_MEMORY_HOTPLUG_LIMIT renamed to XEN_MEMORY_HOTPLUG_LIMIT
(x86_64)
+- commit 5fe2d5c
+
+-------------------------------------------------------------------
@@ -1409 +1484 @@
-- commit e01a7a0
+- commit d848134
@@ -1631,0 +1707,22 @@
+Sun Mar 21 23:42:18 CET 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc4
+- update configs
+ - VFIO=n (s390x/zfcpdump only)
+ - drop SND_SOC_SIRF_AUDIO_CODEC (removed)
+ - drop ADI_AXI_ADC (x86_64, depends on OF now)
+- commit 094141b
+
+-------------------------------------------------------------------
+Sun Mar 21 23:31:58 CET 2021 - mkube...@suse.cz
+
+- config: disable obsolete crypto algorithms (bsc#1180928)
+- CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE y->n
+ - drop CRYPTO_ANUBIS
+ - drop CRYPTO_ARC4
+ - drop CRYPTO_KHAZAD
+ - drop CRYPTO_SEED
+ - drop CRYPTO_TEA
+- commit 1c5c406
+
+-------------------------------------------------------------------
@@ -2739 +2836 @@
-- commit 4e3227f
+- commit e29c84f
@@ -2761,0 +2859,27 @@
+Sun Mar 14 23:07:40 CET 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc3
+- eliminated 3 patches
+ - patches.rpmify/kbuild-dummy-tools-adjust-to-scripts-cc-version.sh.patch
+ - patches.rpmify/kbuild-dummy-tools-fix-inverted-tests-for-gcc.patch
+ - patches.rpmify/kbuild-dummy-tools-support-MPROFILE_KERNEL-checks-fo.patch
+- update configs
+ - COMPILE_TEST=n (s390x)
+ - TMPFS_INODE64=y (s390x)
+- commit 89b1f10
+
+-------------------------------------------------------------------
+Sun Mar 14 21:08:17 CET 2021 - mkube...@suse.cz
+
+- config: update with dummy toolchain
+- new config options:
+ - GCC_PLUGINS=y
+ - GCC_PLUGIN_CYC_COMPLEXITY is not set
+ - GCC_PLUGIN_LATENT_ENTROPY is not set
+ - GCC_PLUGIN_RANDSTRUCT is not set
+ - GCC_PLUGIN_STRUCTLEAK_USER is not set
+ - GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+ - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+- commit 6e44961
+
+-------------------------------------------------------------------
@@ -2900,0 +3025,14 @@
+Wed Mar 10 05:43:53 CET 2021 - jsl...@suse.cz
+
+- kbuild: dummy-tools: adjust to scripts/cc-version.sh
+ (bsc#1181862).
+- commit cfbfafc
+
+-------------------------------------------------------------------
+Tue Mar 9 18:04:01 CET 2021 - msucha...@suse.de
+
+- Delete patches.rpmify/Kconfig-make-CONFIG_CC_CAN_LINK-always-true.patch.
+ Should not be needed anymore with dummy-tools.
+- commit 41fc82c
+
+-------------------------------------------------------------------
@@ -2996 +3134 @@
-- commit 7064b20
+- commit c4424c2
@@ -3189,0 +3328,11 @@
+Sun Mar 7 10:22:49 CET 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc2
+- eliminated 1 patch
+ - patches.suse/swap-fix-swapfile-read-write-offset.patch
+- update configs
+ - KVM_XEN=n (x86)
+ - SND_SOC_SOF_MERRIFIELD=m (i386)
+- commit d9388fc
+
+-------------------------------------------------------------------
@@ -4527,0 +4677,6 @@
+Wed Mar 3 23:24:06 CET 2021 - mkube...@suse.cz
+
+- swap: fix swapfile read/write offset.
+- commit bdb065a
+
+-------------------------------------------------------------------
@@ -4550 +4705,162 @@
-- commit 19ed7d5
+- commit ddbefa3
+
+-------------------------------------------------------------------
+Tue Mar 2 10:51:59 CET 2021 - dmuel...@suse.com
+
+- Remove zte device tree builds
+ The zte vendor directory has been dropped in 5.12.rc1 via this change:
+ commit 89d4f98ae90d95716009bb89823118a8cfbb94dd
+ Author: Arnd Bergmann <a...@arndb.de>
+ Date: Mon Jan 18 14:06:09 2021 +0100
+- commit 6811d6c
+
+-------------------------------------------------------------------
+Mon Mar 1 09:49:57 CET 2021 - mkube...@suse.cz
+
+- Update to 5.12-rc1
+- eliminated 30 patches (26 stable, 4 other)
+ - patches.kernel.org/*
+ - patches.suse/drm-bail-out-of-nouveau_channel_new-if-channel-init-.patch
+ - patches.suse/floppy-reintroduce-O_NDELAY-fix.patch
+ - patches.suse/media-uvcvideo-Accept-invalid-bFormatIndex-and-bFram.patch
++++ 141 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.12324/dtb-aarch64.changes
dtb-armv6l.changes: same change
dtb-armv7l.changes: same change
dtb-riscv64.changes: same change
kernel-64kb.changes: same change
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-docs.changes: same change
kernel-kvmsmall.changes: same change
kernel-lpae.changes: same change
kernel-obs-build.changes: same change
kernel-obs-qa.changes: same change
kernel-pae.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-zfcpdump.changes: same change
Old:
----
linux-5.11.tar.xz
New:
----
linux-5.12.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dtb-aarch64.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:53.874450660 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:53.878450666 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -29,9 +29,9 @@
%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-aarch64
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -329,15 +329,6 @@
%description -n dtb-xilinx
Device Tree files for Xilinx based arm64 systems.
-%package -n dtb-zte
-Summary: ZTE based arm64 systems
-Group: System/Boot
-Provides: multiversion(dtb)
-Requires(post): coreutils
-
-%description -n dtb-zte
-Device Tree files for ZTE based arm64 systems.
-
%prep
@@ -359,7 +350,7 @@
%endif
cd $source/arch/arm64/boot/dts
-for dts in allwinner/*.dts altera/*.dts amazon/*.dts amd/*.dts amlogic/*.dts
apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts
hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts
renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts zte/*.dts
; do
+for dts in allwinner/*.dts altera/*.dts amazon/*.dts amd/*.dts amlogic/*.dts
apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts
hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts
renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do
target=${dts%*.dts}
mkdir -p $PPDIR/$(dirname $target)
cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I.
-I$SRCDIR/include/ -I$SRCDIR/scripts/dtc/include-prefixes/ -P $target.dts -o
$PPDIR/$target.dts
@@ -371,7 +362,7 @@
%install
cd pp
-for dts in allwinner/*.dts altera/*.dts amazon/*.dts amd/*.dts amlogic/*.dts
apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts
hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts
renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts zte/*.dts
; do
+for dts in allwinner/*.dts altera/*.dts amazon/*.dts amd/*.dts amlogic/*.dts
apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts
hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts
renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do
target=${dts%*.dts}
install -m 755 -d %{buildroot}%{dtbdir}/$(dirname $target)
# install -m 644 COPYING %{buildroot}%{dtbdir}/$(dirname $target)
@@ -540,13 +531,6 @@
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
-%post -n dtb-zte
-cd /boot
-# If /boot/dtb is a symlink, remove it, so that we can replace it.
-[ -d dtb ] && [ -L dtb ] && rm -f dtb
-# Unless /boot/dtb exists as real directory, create a symlink.
-[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
-
%ifarch aarch64 riscv64
%files -n dtb-allwinner -f dtb-allwinner.list
%else
@@ -789,15 +773,4 @@
%dir %{dtbdir}/xilinx
%{dtbdir}/xilinx/*.dtb
-%ifarch aarch64 riscv64
-%files -n dtb-zte -f dtb-zte.list
-%else
-%files -n dtb-zte
-%endif
-%defattr(-,root,root)
-%ghost /boot/dtb
-%dir %{dtbdir}
-%dir %{dtbdir}/zte
-%{dtbdir}/zte/*.dtb
-
%changelog
++++++ dtb-armv6l.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:53.898450694 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:53.898450694 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -29,9 +29,9 @@
%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-armv6l
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
dtb-armv7l.spec: same change
dtb-riscv64.spec: same change
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:53.966450790 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:53.966450790 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules xz
@@ -68,9 +68,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0
Group: System/Kernel
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -95,8 +95,8 @@
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
-# for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
-BuildRequires: pahole
+# pahole for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
+BuildRequires: dwarves >= 1.21
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
@@ -179,10 +179,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
-Provides: kernel-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides:
kernel-%build_flavor-base-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
+Provides: kernel-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
# END COMMON DEPS
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
%obsolete_rebuilds %name
Source0:
http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:53.990450824 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:53.994450830 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules xz
@@ -68,9 +68,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -95,8 +95,8 @@
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
-# for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
-BuildRequires: pahole
+# pahole for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
+BuildRequires: dwarves >= 1.21
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
@@ -179,10 +179,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
-Provides: kernel-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides:
kernel-%build_flavor-base-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
+Provides: kernel-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
# END COMMON DEPS
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.014450858 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.018450864 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules xz
@@ -68,9 +68,9 @@
Summary: The Standard Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -95,8 +95,8 @@
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
-# for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
-BuildRequires: pahole
+# pahole for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
+BuildRequires: dwarves >= 1.21
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
@@ -179,10 +179,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
-Provides: kernel-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides:
kernel-%build_flavor-base-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
+Provides: kernel-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
# END COMMON DEPS
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.034450886 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.038450892 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -31,9 +31,9 @@
Summary: Kernel Documentation
License: GPL-2.0
Group: Documentation/Man
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -63,7 +63,7 @@
%endif
Url: http://www.kernel.org/
Provides: %name = %version-%source_rel
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:
http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
++++++ kernel-kvmsmall.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.062450926 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.062450926 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules xz
@@ -68,9 +68,9 @@
Summary: The Small Developer Kernel for KVM
License: GPL-2.0
Group: System/Kernel
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -95,8 +95,8 @@
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
-# for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
-BuildRequires: pahole
+# pahole for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
+BuildRequires: dwarves >= 1.21
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
@@ -179,10 +179,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
-Provides: kernel-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides:
kernel-%build_flavor-base-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
+Provides: kernel-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
# END COMMON DEPS
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
%obsolete_rebuilds %name
Source0:
http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.106450988 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.110450994 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 5.11.16
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
@@ -45,7 +45,7 @@
%endif
%endif
%endif
-BuildRequires:
kernel%kernel_flavor-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+BuildRequires:
kernel%kernel_flavor-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
%if 0%{?rhel_version}
BuildRequires: kernel
@@ -64,9 +64,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -116,7 +116,7 @@
# a longer list to have them also available for qemu cross builds where x86_64
kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org,
so we stay compatible.
-export KERNEL_MODULES="loop dm-crypt dm-mod dm-snapshot binfmt-misc fuse kqemu
squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc
virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1
ibmvscsi sd_mod e1000 ibmveth overlay"
+export KERNEL_MODULES="loop dm-crypt essiv dm-mod dm-snapshot binfmt-misc fuse
kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc
virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1
ibmvscsi sd_mod e1000 ibmveth overlay"
# manually load all modules to make sure they're available
for i in $KERNEL_MODULES; do
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.130451023 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.134451028 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 5.11.16
+%define patchversion 5.12.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.154451057 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.158451062 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules xz
@@ -68,9 +68,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -95,8 +95,8 @@
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
-# for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
-BuildRequires: pahole
+# pahole for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
+BuildRequires: dwarves >= 1.21
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
@@ -179,10 +179,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
-Provides: kernel-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides:
kernel-%build_flavor-base-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
+Provides: kernel-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
# END COMMON DEPS
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.178451091 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.182451096 +0200
@@ -17,8 +17,8 @@
# icecream 0
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
@@ -30,9 +30,9 @@
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -43,7 +43,7 @@
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
Provides: linux
Provides: multiversion(kernel)
Source0:
http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
@@ -206,6 +206,7 @@
# Unpack the vanilla kernel sources
tar -xf %{S:0}
+find . -type l | while read f; do test -e "$f" || rm -v "$f"; done
if test "%srcversion" != "%kernelrelease%variant"; then
mv linux-%srcversion linux-%kernelrelease%variant
fi
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.202451125 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.206451130 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 5.11.16
+Version: 5.12.0
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -52,7 +52,7 @@
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.222451153 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.226451159 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.11
-%define patchversion 5.11.16
+%define srcversion 5.12
+%define patchversion 5.12.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules xz
@@ -68,9 +68,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0
Group: System/Kernel
-Version: 5.11.16
+Version: 5.12.0
%if 0%{?is_kotd}
-Release: <RELEASE>.ge06d321
+Release: <RELEASE>.g5d43652
%else
Release: 0
%endif
@@ -95,8 +95,8 @@
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
-# for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
-BuildRequires: pahole
+# pahole for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
+BuildRequires: dwarves >= 1.21
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
@@ -179,10 +179,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
-Provides: kernel-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides:
kernel-%build_flavor-base-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
+Provides: kernel-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
# END COMMON DEPS
-Provides: %name-srchash-e06d321f0fedc62f2ae9fe030f6d2413efc15633
+Provides: %name-srchash-5d43652877fda8aa556866abab93cad61f1f9b6f
%obsolete_rebuilds %name
Source0:
http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
kernel-zfcpdump.spec: same change
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.462451493 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.462451493 +0200
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.11
+SRCVERSION=5.12
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# enable kernel module compression
++++++ config.tar.bz2 ++++++
++++ 8012 lines of diff (skipped)
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.882452089 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.882452089 +0200
@@ -95,8 +95,8 @@
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
-# for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
-BuildRequires: pahole
+# pahole for CONFIG_DEBUG_INFO_BTF - ToDo: make it conditional
+BuildRequires: dwarves >= 1.21
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
++++++ kernel-obs-build.spec.in ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:54.974452219 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:54.978452224 +0200
@@ -116,7 +116,7 @@
# a longer list to have them also available for qemu cross builds where x86_64
kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org,
so we stay compatible.
-export KERNEL_MODULES="loop dm-crypt dm-mod dm-snapshot binfmt-misc fuse kqemu
squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc
virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1
ibmvscsi sd_mod e1000 ibmveth overlay"
+export KERNEL_MODULES="loop dm-crypt essiv dm-mod dm-snapshot binfmt-misc fuse
kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc
virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1
ibmvscsi sd_mod e1000 ibmveth overlay"
# manually load all modules to make sure they're available
for i in $KERNEL_MODULES; do
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:55.046452321 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:55.046452321 +0200
@@ -206,6 +206,7 @@
# Unpack the vanilla kernel sources
tar -xf %{S:0}
+find . -type l | while read f; do test -e "$f" || rm -v "$f"; done
if test "%srcversion" != "%kernelrelease%variant"; then
mv linux-%srcversion linux-%kernelrelease%variant
fi
++++++ linux-5.11.tar.xz -> linux-5.12.tar.xz ++++++
/work/SRC/openSUSE:Factory/kernel-source/linux-5.11.tar.xz
/work/SRC/openSUSE:Factory/.kernel-source.new.12324/linux-5.12.tar.xz differ:
char 27, line 1
++++++ macros.kernel-source ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:55.146452463 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:55.146452463 +0200
@@ -77,7 +77,8 @@
: -n is actually passed to the macro. Fix this here, so that
: we do not have to modify the modsign-repackage script
sed "s|@CERTS@|$cert|g; s|%%{-n.}|%{-n*}%{!-n:%name}|g"
/usr/lib/rpm/kernel-cert-subpackage \
- echo "%%global __spec_install_pre %%__spec_install_pre mkdir -p
%%buildroot/etc/uefi/certs; openssl x509 -in %{-c*} -inform $fmt -out
%%buildroot/$cert -outform DER" } \
+ echo "%%global __spec_install_pre %%__spec_install_pre \\\\\
+ mkdir -p %%buildroot/etc/uefi/certs; openssl x509 -in %{-c*} -inform $fmt
-out %%buildroot/$cert -outform DER" } \
)}
# kernel_module_package: simply pass on all options and arguments.
++++++ mkspec-dtb ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:55.170452497 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:55.170452497 +0200
@@ -81,7 +81,6 @@
['dtb-socionext', 'socionext/*.dts', "Socionext based arm64
systems"],
['dtb-sprd', 'sprd/*.dts', "Spreadtrum based arm64
systems"],
['dtb-xilinx', 'xilinx/*.dts', "Xilinx based arm64
systems"],
- ['dtb-zte', 'zte/*.dts', "ZTE based arm64
systems"],
);
# DTB packages names
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 189603 lines of diff (skipped)
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.rpmify/Add-ksym-provides-tool.patch
new/patches.rpmify/Add-ksym-provides-tool.patch
--- old/patches.rpmify/Add-ksym-provides-tool.patch 2021-03-30
19:57:52.000000000 +0200
+++ new/patches.rpmify/Add-ksym-provides-tool.patch 2021-04-09
22:54:55.000000000 +0200
@@ -14,9 +14,9 @@
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
-@@ -1,11 +1,15 @@
- # SPDX-License-Identifier: GPL-2.0
+@@ -2,11 +2,15 @@
OBJECT_FILES_NON_STANDARD := y
+ CFLAGS_REMOVE_empty.o += $(CC_FLAGS_LTO)
-hostprogs-always-y += modpost mk_elfconfig
+hostprogs-always-y += modpost mk_elfconfig ksym-provides
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.rpmify/kbuild-dummy-tools-support-MPROFILE_KERNEL-checks-fo.patch
new/patches.rpmify/kbuild-dummy-tools-support-MPROFILE_KERNEL-checks-fo.patch
---
old/patches.rpmify/kbuild-dummy-tools-support-MPROFILE_KERNEL-checks-fo.patch
2021-03-30 19:57:52.000000000 +0200
+++
new/patches.rpmify/kbuild-dummy-tools-support-MPROFILE_KERNEL-checks-fo.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-From: Jiri Slaby <jsl...@suse.cz>
-Date: Wed, 3 Mar 2021 11:36:40 +0100
-Subject: kbuild: dummy-tools, support MPROFILE_KERNEL checks for ppc
-Patch-mainline: 5.12-rc3
-Git-commit: 2eab791f940b98d0bdd4d1e8c4857f3dec3c7d04
-References: bsc#1181862
-
-ppc64le checks for -mprofile-kernel to define MPROFILE_KERNEL Kconfig.
-Kconfig calls arch/powerpc/tools/gcc-check-mprofile-kernel.sh for that
-purpose. This script performs two checks:
-1) build with -mprofile-kernel should contain "_mcount"
-2) build with -mprofile-kernel with a function marked as "notrace"
- should not produce "_mcount"
-
-So support this in dummy-tools' gcc, so that we have MPROFILE_KERNEL
-always true.
-
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
-Cc: Masahiro Yamada <masahi...@kernel.org>
----
- scripts/dummy-tools/gcc | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc
-index 0d0589cf8184..7b10332b23ba 100755
---- a/scripts/dummy-tools/gcc
-+++ b/scripts/dummy-tools/gcc
-@@ -73,6 +73,15 @@ if arg_contain -S "$@"; then
- echo "%gs"
- exit 0
- fi
-+
-+ # For arch/powerpc/tools/gcc-check-mprofile-kernel.sh
-+ if arg_contain -m64 "$@" && arg_contain -mlittle-endian "$@" &&
-+ arg_contain -mprofile-kernel "$@"; then
-+ if ! test -t 0 && ! grep -q notrace; then
-+ echo "_mcount"
-+ fi
-+ exit 0
-+ fi
- fi
-
- # To set GCC_PLUGINS
---
-2.30.1
-
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/acpi_thermal_passive_blacklist.patch
new/patches.suse/acpi_thermal_passive_blacklist.patch
--- old/patches.suse/acpi_thermal_passive_blacklist.patch 2021-04-14
08:57:33.000000000 +0200
+++ new/patches.suse/acpi_thermal_passive_blacklist.patch 2021-04-26
06:25:46.000000000 +0200
@@ -4,12 +4,12 @@
Patch-mainline: not yet, <jeffm: awaiting feedback from trenn, Oct 4, 2017>
---
- drivers/acpi/thermal.c | 92 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 92 insertions(+)
+ drivers/acpi/thermal.c | 93 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 93 insertions(+)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
-@@ -23,6 +23,7 @@
+@@ -25,6 +25,7 @@
#include <linux/kmod.h>
#include <linux/reboot.h>
#include <linux/device.h>
@@ -17,7 +17,7 @@
#include <linux/thermal.h>
#include <linux/acpi.h>
#include <linux/workqueue.h>
-@@ -1041,6 +1042,85 @@ static void acpi_thermal_check_fn(struct work_struct
*work)
+@@ -1019,6 +1020,86 @@ static void acpi_thermal_check_fn(struct work_struct
*work)
mutex_unlock(&tz->thermal_check_lock);
}
@@ -89,13 +89,14 @@
+ /* Convert value to deci-seconds */
+ tz->polling_frequency = seconds * 10;
+
-+ tz->thermal_zone->polling_delay = seconds * 1000;
++ tz->thermal_zone->polling_delay_jiffies =
++ round_jiffies(msecs_to_jiffies(seconds * 1000));
+
+ thermal_zone_device_update(tz->thermal_zone, THERMAL_EVENT_UNSPECIFIED);
+
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO,
++ acpi_handle_debug(tz->device->handle,
+ "Polling frequency set to %lu seconds\n",
-+ tz->polling_frequency/10));
++ tz->polling_frequency / 10);
+
+ return 0;
+}
@@ -103,7 +104,7 @@
static int acpi_thermal_add(struct acpi_device *device)
{
int result = 0;
-@@ -1070,6 +1150,18 @@ static int acpi_thermal_add(struct acpi_device *device)
+@@ -1048,6 +1129,18 @@ static int acpi_thermal_add(struct acpi_device *device)
if (result)
goto free_memory;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/btrfs-use-the-new-VFS-super_block_dev.patch
new/patches.suse/btrfs-use-the-new-VFS-super_block_dev.patch
--- old/patches.suse/btrfs-use-the-new-VFS-super_block_dev.patch
2021-04-14 08:57:33.000000000 +0200
+++ new/patches.suse/btrfs-use-the-new-VFS-super_block_dev.patch
2021-04-26 06:25:46.000000000 +0200
@@ -23,7 +23,7 @@
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
-@@ -1117,11 +1117,8 @@ struct btrfs_root {
+@@ -1133,11 +1133,8 @@ struct btrfs_root {
* protected by inode_lock
*/
struct radix_tree_root delayed_nodes_tree;
@@ -39,7 +39,7 @@
refcount_t refs;
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
-@@ -1070,9 +1070,9 @@ static void __setup_root(struct btrfs_root *root, struct
btrfs_fs_info *fs_info,
+@@ -1135,9 +1135,9 @@ static void __setup_root(struct btrfs_root *root, struct
btrfs_fs_info *fs_info,
memset(&root->root_item, 0, sizeof(root->root_item));
memset(&root->defrag_progress, 0, sizeof(root->defrag_progress));
root->root_key.objectid = objectid;
@@ -50,7 +50,7 @@
btrfs_qgroup_init_swapped_blocks(&root->swapped_blocks);
#ifdef CONFIG_BTRFS_DEBUG
INIT_LIST_HEAD(&root->leak_list);
-@@ -1358,11 +1358,13 @@ static int btrfs_init_fs_root(struct btrfs_root *root,
dev_t anon_dev)
+@@ -1446,11 +1446,13 @@ static int btrfs_init_fs_root(struct btrfs_root *root,
dev_t anon_dev)
if (is_fstree(root->root_key.objectid) &&
btrfs_root_refs(&root->root_item) > 0) {
if (!anon_dev) {
@@ -66,7 +66,7 @@
}
}
-@@ -2016,8 +2018,7 @@ void btrfs_put_root(struct btrfs_root *root)
+@@ -2103,8 +2105,7 @@ void btrfs_put_root(struct btrfs_root *root)
if (refcount_dec_and_test(&root->refs)) {
WARN_ON(!RB_EMPTY_ROOT(&root->inode_tree));
WARN_ON(test_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state));
@@ -78,7 +78,7 @@
#ifdef CONFIG_BTRFS_DEBUG
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
-@@ -4210,8 +4210,7 @@ int btrfs_delete_subvolume(struct inode *dir, struct
dentry *dentry)
+@@ -4366,8 +4366,7 @@ int btrfs_delete_subvolume(struct inode *dir, struct
dentry *dentry)
}
}
@@ -88,10 +88,10 @@
out_end_trans:
trans->block_rsv = NULL;
trans->bytes_reserved = 0;
-@@ -8842,7 +8841,7 @@ static int btrfs_getattr(const struct path *path, struct
kstat *stat,
+@@ -9048,7 +9047,7 @@ static int btrfs_getattr(struct user_namespace
*mnt_userns,
STATX_ATTR_NODUMP);
- generic_fillattr(inode, stat);
+ generic_fillattr(&init_user_ns, inode, stat);
- stat->dev = BTRFS_I(inode)->root->anon_dev;
+ stat->dev = BTRFS_I(inode)->root->sbdev.anon_dev;
@@ -99,7 +99,7 @@
delalloc_bytes = BTRFS_I(inode)->new_delalloc_bytes;
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
-@@ -878,8 +878,11 @@ static int create_snapshot(struct btrfs_root *root,
struct inode *dir,
+@@ -881,8 +881,11 @@ static int create_snapshot(struct btrfs_root *root,
struct inode *dir,
pending_snapshot->anon_dev = 0;
fail:
/* Prevent double freeing of anon_dev */
@@ -115,7 +115,7 @@
free_pending:
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
-@@ -2457,7 +2457,7 @@ static int btrfs_show_devname(struct seq_file *m, struct
dentry *root)
+@@ -2497,7 +2497,7 @@ static int btrfs_show_devname(struct seq_file *m, struct
dentry *root)
static dev_t btrfs_get_inode_dev(const struct inode *inode)
{
@@ -161,7 +161,7 @@
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2288,6 +2288,8 @@ void free_anon_bdev(dev_t);
+@@ -2389,6 +2389,8 @@ void free_anon_bdev(dev_t);
/* These two are to be used only by btrfs */
int insert_anon_sbdev(struct super_block *sb, struct super_block_dev *sbdev);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/drm-i915-ilk-glk-Fix-link-training-on-links-with-LTT.patch
new/patches.suse/drm-i915-ilk-glk-Fix-link-training-on-links-with-LTT.patch
--- old/patches.suse/drm-i915-ilk-glk-Fix-link-training-on-links-with-LTT.patch
2021-04-14 08:57:33.000000000 +0200
+++ new/patches.suse/drm-i915-ilk-glk-Fix-link-training-on-links-with-LTT.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
-From: Imre Deak <imre.d...@intel.com>
-Subject: [PATCH] drm/i915/ilk-glk: Fix link training on links with LTTPRs
-Date: Tue, 16 Mar 2021 18:54:26 +0200
-Message-id: <20210316165426.3388513-1-imre.d...@intel.com>
-Patch-mainline: Submitted, intel-gfx ML
-References: bsc#1183294
-
-The spec requires to use at least 3.2ms for the AUX timeout period if
-there are LT-tunable PHY Repeaters on the link (2.11.2). An upcoming
-spec update makes this more specific, by requiring a 3.2ms minimum
-timeout period for the LTTPR detection reading the 0xF0000-0xF0007
-range (3.6.5.1).
-
-Accordingly disable LTTPR detection until GLK, where the maximum timeout
-we can set is only 1.6ms.
-
-Link training in the non-transparent mode is known to fail at least on
-some SKL systems with a WD19 dock on the link, which exposes an LTTPR
-(see the References below). While this could have different reasons
-besides the too short AUX timeout used, not detecting LTTPRs (and so not
-using the non-transparent LT mode) fixes link training on these systems.
-
-While at it add a code comment about the platform specific maximum
-timeout values.
-
-Reported-by: Takashi Iwai <ti...@suse.de>
-References: https://gitlab.freedesktop.org/drm/intel/-/issues/3166
-Fixes: b30edfd8d0b4 ("drm/i915: Switch to LTTPR non-transparent mode link
training")
-Cc: <sta...@vger.kernel.org> # v5.11
-Cc: Takashi Iwai <ti...@suse.de>
-Signed-off-by: Imre Deak <imre.d...@intel.com>
-Acked-by: Takashi Iwai <ti...@suse.de>
-
----
- drivers/gpu/drm/i915/display/intel_dp.c | 7 +++++++
- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 8 ++++++++
- 2 files changed, 15 insertions(+)
-
---- a/drivers/gpu/drm/i915/display/intel_dp.c
-+++ b/drivers/gpu/drm/i915/display/intel_dp.c
-@@ -1400,6 +1400,7 @@ static u32 g4x_get_aux_send_ctl(struct i
- else
- precharge = 5;
-
-+ /* Max timeout value on ILK-BDW: 1.6ms */
- if (IS_BROADWELL(dev_priv))
- timeout = DP_AUX_CH_CTL_TIME_OUT_600us;
- else
-@@ -1426,6 +1427,12 @@ static u32 skl_get_aux_send_ctl(struct i
- enum phy phy = intel_port_to_phy(i915, dig_port->base.port);
- u32 ret;
-
-+ /*
-+ * Max timeout values:
-+ * SKL-GLK: 1.6ms
-+ * CNL: 3.2ms
-+ * ICL+: 4ms
-+ */
- ret = DP_AUX_CH_CTL_SEND_BUSY |
- DP_AUX_CH_CTL_DONE |
- DP_AUX_CH_CTL_INTERRUPT |
---- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
-+++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
-@@ -134,10 +134,18 @@ intel_dp_set_lttpr_transparent_mode(stru
- */
- int intel_dp_lttpr_init(struct intel_dp *intel_dp)
- {
-+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
- int lttpr_count;
- bool ret;
- int i;
-
-+ /*
-+ * Detecting LTTPRs must be avoided on platforms with an AUX timeout
-+ * period < 3.2ms. (see DP Standard v2.0, 2.11.2, 3.6.6.1).
-+ */
-+ if (INTEL_GEN(i915) < 10)
-+ return 0;
-+
- if (intel_dp_is_edp(intel_dp))
- return 0;
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/drm-ttm-stop-destroying-pinned-ghost-object.patch
new/patches.suse/drm-ttm-stop-destroying-pinned-ghost-object.patch
--- old/patches.suse/drm-ttm-stop-destroying-pinned-ghost-object.patch
2021-04-14 08:57:33.000000000 +0200
+++ new/patches.suse/drm-ttm-stop-destroying-pinned-ghost-object.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koe...@amd.com>
-Date: Tue, 1 Dec 2020 14:27:34 +0100
-Subject: drm/ttm: stop destroying pinned ghost object
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Git-commit: b73cd1e2ebfc8c22741eb4439bc5d347555f3e84
-Patch-mainline: 5.12-rc1
-References: git-fixes
-
-Daniel added a warning for this, but we were abusing that behavior here.
-
-Signed-off-by: Christian K??nig <christian.koe...@amd.com>
-Fixes: 57fcd550eb15 ("drm/ttm: Warn on pinning without holding a reference")
-Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch>
-Link: https://patchwork.freedesktop.org/series/84456/
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c
b/drivers/gpu/drm/ttm/ttm_bo_util.c
-index 7ccb2295cac1..5bbc1339d28e 100644
---- a/drivers/gpu/drm/ttm/ttm_bo_util.c
-+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
-@@ -310,7 +310,7 @@ static int ttm_buffer_object_transfer(struct
ttm_buffer_object *bo,
- kref_init(&fbo->base.kref);
- fbo->base.destroy = &ttm_transfered_destroy;
- fbo->base.acc_size = 0;
-- fbo->base.pin_count = 1;
-+ fbo->base.pin_count = 0;
- if (bo->type != ttm_bo_type_sg)
- fbo->base.base.resv = &fbo->base.base._resv;
-
-@@ -319,6 +319,8 @@ static int ttm_buffer_object_transfer(struct
ttm_buffer_object *bo,
- ret = dma_resv_trylock(&fbo->base.base._resv);
- WARN_ON(!ret);
-
-+ ttm_bo_move_to_lru_tail_unlocked(&fbo->base);
-+
- *new_obj = &fbo->base;
- return 0;
- }
---
-2.31.0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/nvmem-add-driver-to-expose-reserved-memory-as-nvmem.patch
new/patches.suse/nvmem-add-driver-to-expose-reserved-memory-as-nvmem.patch
--- old/patches.suse/nvmem-add-driver-to-expose-reserved-memory-as-nvmem.patch
2021-04-14 08:57:33.000000000 +0200
+++ new/patches.suse/nvmem-add-driver-to-expose-reserved-memory-as-nvmem.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,167 +0,0 @@
-From: Nicolas Saenz Julienne <nsaenzjulie...@suse.de>
-Date: Thu, 10 Dec 2020 12:13:49 +0100
-Subject: nvmem: Add driver to expose reserved memory as nvmem
-Patch-mainline: Submitted,
https://lore.kernel.org/linux-arm-kernel/20210112142342.7290-3-nsaenzjulie...@suse.de/
-References: jsc#SLE-SLE-16616
-
-Firmware/co-processors might use reserved memory areas in order to pass
-data stemming from an nvmem device otherwise non accessible to Linux.
-For example an EEPROM memory only physically accessible to firmware, or
-data only accessible early at boot time.
-
-In order to expose this data to other drivers and user-space, the driver
-models the reserved memory area as an nvmem device.
-
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulie...@suse.de>
-Reviewed-by: Rob Herring <r...@kernel.org>
-
----
- drivers/nvmem/Kconfig | 8 +++++
- drivers/nvmem/Makefile | 2 ++
- drivers/nvmem/rmem.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++
- drivers/of/platform.c | 1 +
- 4 files changed, 108 insertions(+)
-
-diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
-index 954d3b4a52ab..fecc19b884bf 100644
---- a/drivers/nvmem/Kconfig
-+++ b/drivers/nvmem/Kconfig
-@@ -270,4 +270,12 @@ config SPRD_EFUSE
- This driver can also be built as a module. If so, the module
- will be called nvmem-sprd-efuse.
-
-+config NVMEM_RMEM
-+ tristate "Reserved Memory Based Driver Support"
-+ help
-+ This drivers maps reserved memory into an nvmem device. It might be
-+ useful to expose information left by firmware in memory.
-+
-+ This driver can also be built as a module. If so, the module
-+ will be called nvmem-rmem.
- endif
-diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile
-index a7c377218341..5376b8e0dae5 100644
---- a/drivers/nvmem/Makefile
-+++ b/drivers/nvmem/Makefile
-@@ -55,3 +55,5 @@ obj-$(CONFIG_NVMEM_ZYNQMP) += nvmem_zynqmp_nvmem.o
- nvmem_zynqmp_nvmem-y := zynqmp_nvmem.o
- obj-$(CONFIG_SPRD_EFUSE) += nvmem_sprd_efuse.o
- nvmem_sprd_efuse-y := sprd-efuse.o
-+obj-$(CONFIG_NVMEM_RMEM) += nvmem-rmem.o
-+nvmem-rmem-y := rmem.o
-diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c
-new file mode 100644
-index 000000000000..b11c3c974b3d
---- /dev/null
-+++ b/drivers/nvmem/rmem.c
-@@ -0,0 +1,97 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright (C) 2020 Nicolas Saenz Julienne <nsaenzjulie...@suse.de>
-+ */
-+
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/nvmem-provider.h>
-+#include <linux/of_reserved_mem.h>
-+#include <linux/platform_device.h>
-+
-+struct rmem {
-+ struct device *dev;
-+ struct nvmem_device *nvmem;
-+ struct reserved_mem *mem;
-+
-+ phys_addr_t size;
-+};
-+
-+static int rmem_read(void *context, unsigned int offset,
-+ void *val, size_t bytes)
-+{
-+ struct rmem *priv = context;
-+ size_t available = priv->mem->size;
-+ loff_t off = offset;
-+ void *addr;
-+ int count;
-+
-+ /*
-+ * Only map the reserved memory at this point to avoid potential rogue
-+ * kernel threads inadvertently modifying it. Based on the current
-+ * uses-cases for this driver, the performance hit isn't a concern.
-+ * Nor is likely to be, given the nature of the subsystem. Most nvmem
-+ * devices operate over slow buses to begin with.
-+ *
-+ * An alternative would be setting the memory as RO, set_memory_ro(),
-+ * but as of Dec 2020 this isn't possible on arm64.
-+ */
-+ addr = memremap(priv->mem->base, available, MEMREMAP_WB);
-+ if (IS_ERR(addr)) {
-+ dev_err(priv->dev, "Failed to remap memory region\n");
-+ return PTR_ERR(addr);
-+ }
-+
-+ count = memory_read_from_buffer(val, bytes, &off, addr, available);
-+
-+ memunmap(addr);
-+
-+ return count;
-+}
-+
-+static int rmem_probe(struct platform_device *pdev)
-+{
-+ struct nvmem_config config = { };
-+ struct device *dev = &pdev->dev;
-+ struct reserved_mem *mem;
-+ struct rmem *priv;
-+
-+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-+ if (!priv)
-+ return -ENOMEM;
-+ priv->dev = dev;
-+
-+ mem = of_reserved_mem_lookup(dev->of_node);
-+ if (!mem) {
-+ dev_err(dev, "Failed to lookup reserved memory\n");
-+ return -EINVAL;
-+ }
-+ priv->mem = mem;
-+
-+ config.dev = dev;
-+ config.priv = priv;
-+ config.name = "rmem";
-+ config.size = mem->size;
-+ config.reg_read = rmem_read;
-+
-+ return PTR_ERR_OR_ZERO(devm_nvmem_register(dev, &config));
-+}
-+
-+static const struct of_device_id rmem_match[] = {
-+ { .compatible = "nvmem-rmem", },
-+ { /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, rmem_match);
-+
-+static struct platform_driver rmem_driver = {
-+ .probe = rmem_probe,
-+ .driver = {
-+ .name = "rmem",
-+ .of_match_table = rmem_match,
-+ },
-+};
-+module_platform_driver(rmem_driver);
-+
-+MODULE_AUTHOR("Nicolas Saenz Julienne <nsaenzjulie...@suse.de>");
-+MODULE_DESCRIPTION("Reserved Memory Based nvmem Driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/of/platform.c b/drivers/of/platform.c
-index 79bd5f5a1bf1..6699cdbe58b6 100644
---- a/drivers/of/platform.c
-+++ b/drivers/of/platform.c
-@@ -511,6 +511,7 @@ static const struct of_device_id reserved_mem_matches[] = {
- { .compatible = "qcom,rmtfs-mem" },
- { .compatible = "qcom,cmd-db" },
- { .compatible = "ramoops" },
-+ { .compatible = "nvmem-rmem" },
- {}
- };
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/supported-flag
new/patches.suse/supported-flag
--- old/patches.suse/supported-flag 2021-04-14 08:57:33.000000000 +0200
+++ new/patches.suse/supported-flag 2021-04-26 06:25:46.000000000 +0200
@@ -35,7 +35,7 @@
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -5526,6 +5526,14 @@
+@@ -5576,6 +5576,14 @@
unknown_nmi_panic
[X86] Cause panic on unknown NMI.
@@ -122,7 +122,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -341,6 +341,11 @@ else # !mixed-build
+@@ -339,6 +339,11 @@ else # !mixed-build
include scripts/Kbuild.include
@@ -136,7 +136,7 @@
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if
$(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
-@@ -378,6 +378,9 @@ extern bool panic_on_taint_nousertaint;
+@@ -393,6 +393,9 @@ extern bool panic_on_taint_nousertaint;
extern int sysctl_panic_on_rcu_stall;
extern int sysctl_max_rcu_stall_to_panic;
extern int sysctl_panic_on_stackoverflow;
@@ -146,7 +146,7 @@
extern bool crash_kexec_post_notifiers;
-@@ -446,6 +449,23 @@ extern enum system_states {
+@@ -461,6 +464,23 @@ extern enum system_states {
#define TAINT_FLAGS_COUNT 18
#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1)
@@ -172,7 +172,7 @@
char c_false; /* character printed when not tainted */
--- a/include/linux/module.h
+++ b/include/linux/module.h
-@@ -566,6 +566,9 @@ bool is_module_address(unsigned long addr);
+@@ -547,6 +547,9 @@ bool is_module_address(unsigned long addr);
bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr);
bool is_module_percpu_address(unsigned long addr);
bool is_module_text_address(unsigned long addr);
@@ -273,7 +273,7 @@
/*
* Mutex protects:
* 1) List of modules (also safely readable with preempt_disable),
-@@ -1223,6 +1239,12 @@ static size_t module_flags_taint(struct module *mod,
char *buf)
+@@ -1127,6 +1143,12 @@ static size_t module_flags_taint(struct module *mod,
char *buf)
buf[l++] = taint_flags[i].c_true;
}
@@ -286,7 +286,7 @@
return l;
}
-@@ -1294,6 +1316,33 @@ static ssize_t show_taint(struct module_attribute
*mattr,
+@@ -1198,6 +1220,33 @@ static ssize_t show_taint(struct module_attribute
*mattr,
static struct module_attribute modinfo_taint =
__ATTR(taint, 0444, show_taint, NULL);
@@ -320,7 +320,7 @@
static struct module_attribute *modinfo_attrs[] = {
&module_uevent,
&modinfo_version,
-@@ -1302,6 +1351,9 @@ static struct module_attribute *modinfo_attrs[] = {
+@@ -1206,6 +1255,9 @@ static struct module_attribute *modinfo_attrs[] = {
&modinfo_coresize,
&modinfo_initsize,
&modinfo_taint,
@@ -330,7 +330,7 @@
#ifdef CONFIG_MODULE_UNLOAD
&modinfo_refcnt,
#endif
-@@ -1962,8 +2014,37 @@ static int mod_sysfs_setup(struct module *mod,
+@@ -1868,8 +1920,37 @@ static int mod_sysfs_setup(struct module *mod,
add_sect_attrs(mod, info);
add_notes_attrs(mod, info);
@@ -368,7 +368,7 @@
out_unreg_modinfo_attrs:
module_remove_modinfo_attrs(mod, -1);
out_unreg_param:
-@@ -4656,6 +4737,9 @@ void print_modules(void)
+@@ -4665,6 +4746,9 @@ void print_modules(void)
if (last_unloaded_module[0])
pr_cont(" [last unloaded: %s]", last_unloaded_module);
pr_cont("\n");
@@ -410,7 +410,7 @@
.data = &panic_on_oops,
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
-@@ -89,7 +89,11 @@ endif
+@@ -92,7 +92,11 @@ endif
MODPOST += \
$(addprefix -i ,$(wildcard $(input-symdump))) \
$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \
@@ -425,15 +425,15 @@
ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
-@@ -20,6 +20,7 @@
- #include <stdbool.h>
+@@ -19,6 +19,7 @@
+ #include <limits.h>
#include <errno.h>
#include "modpost.h"
+#include "../../include/generated/autoconf.h"
#include "../../include/linux/license.h"
/* Are we using CONFIG_MODVERSIONS? */
-@@ -1992,6 +1993,50 @@ static char *remove_dot(char *s)
+@@ -1967,6 +1968,50 @@ static char *remove_dot(char *s)
return s;
}
@@ -484,7 +484,7 @@
static void read_symbols(const char *modname)
{
const char *symname;
-@@ -2278,6 +2323,15 @@ static void add_staging_flag(struct buffer *b, const
char *name)
+@@ -2232,6 +2277,15 @@ static void add_staging_flag(struct buffer *b, const
char *name)
buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
}
@@ -500,7 +500,7 @@
/**
* Record CRCs for unresolved symbols
**/
-@@ -2416,6 +2470,15 @@ static void write_if_changed(struct buffer *b, const
char *fname)
+@@ -2370,6 +2424,15 @@ static void write_if_changed(struct buffer *b, const
char *fname)
write_buf(b, fname);
}
@@ -516,7 +516,7 @@
/* parse Module.symvers file. line format:
* 0x12345678<tab>symbol<tab>module<tab>export<tab>namespace
**/
-@@ -2541,12 +2604,15 @@ int main(int argc, char **argv)
+@@ -2495,12 +2558,15 @@ int main(int argc, char **argv)
struct buffer buf = { };
char *missing_namespace_deps = NULL;
char *dump_write = NULL, *files_source = NULL;
@@ -533,7 +533,7 @@
switch (opt) {
case 'e':
external_module = 1;
-@@ -2584,11 +2650,20 @@ int main(int argc, char **argv)
+@@ -2538,11 +2604,20 @@ int main(int argc, char **argv)
case 'd':
missing_namespace_deps = optarg;
break;
@@ -554,7 +554,7 @@
while (dump_read_start) {
struct dump_list *tmp;
-@@ -2626,6 +2701,9 @@ int main(int argc, char **argv)
+@@ -2580,6 +2655,9 @@ int main(int argc, char **argv)
add_intree_flag(&buf, !external_module);
add_retpoline(&buf);
add_staging_flag(&buf, mod->name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/supported-flag-modverdir
new/patches.suse/supported-flag-modverdir
--- old/patches.suse/supported-flag-modverdir 2021-04-14 08:57:33.000000000
+0200
+++ new/patches.suse/supported-flag-modverdir 2021-04-26 06:25:46.000000000
+0200
@@ -11,9 +11,9 @@
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
-@@ -43,6 +43,8 @@ __modpost:
- include include/config/auto.conf
- include scripts/Kbuild.include
+@@ -46,6 +46,8 @@ include scripts/Kbuild.include
+ # for ld_flags
+ include scripts/Makefile.lib
+MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword
$(KBUILD_EXTMOD))/).tmp_versions
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/supported-flag-wildcards
new/patches.suse/supported-flag-wildcards
--- old/patches.suse/supported-flag-wildcards 2021-04-14 08:57:33.000000000
+0200
+++ new/patches.suse/supported-flag-wildcards 2021-04-26 06:25:46.000000000
+0200
@@ -1,26 +1,24 @@
-From 6a94b67bcac67e4b52622366cec019ea14c0ddd0 Mon Sep 17 00:00:00 2001
From: Michal Marek <mma...@suse.cz>
Date: Mon, 19 Sep 2011 16:31:49 +0200
-Subject: [PATCH] modpost: Allow wildcards in the Module.supported file
+Subject: modpost: Allow wildcards in the Module.supported file
Patch-mainline: Never, SLES feature
Signed-off-by: Michal Marek <mma...@suse.cz>
-
---
- scripts/mod/modpost.c | 45 ++++++++++++++++++++++++++++-----------------
+ scripts/mod/modpost.c | 45 +++++++++++++++++++++++++++----------------
1 file changed, 28 insertions(+), 17 deletions(-)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,7 @@
#include <stdio.h>
#include <ctype.h>
#include <string.h>
+#include <fnmatch.h>
#include <limits.h>
- #include <stdbool.h>
#include <errno.h>
-@@ -1702,7 +1703,7 @@ static char *underscores(char *string)
+ #include "modpost.h"
+@@ -2004,7 +2005,7 @@ static char *underscores(char *string)
void *supported_file;
unsigned long supported_size;
@@ -29,7 +27,7 @@
{
unsigned long pos = 0;
char *line;
-@@ -1710,8 +1711,9 @@ static const char *supported(struct modu
+@@ -2012,8 +2013,9 @@ static const char *supported(struct module *mod)
/* In a first shot, do a simple linear scan. */
while ((line = get_next_line(&pos, supported_file,
supported_size))) {
@@ -40,7 +38,7 @@
/* optional type-of-support flag */
for (l = line; *l != '\0'; l++) {
-@@ -1721,29 +1723,38 @@ static const char *supported(struct modu
+@@ -2023,29 +2025,38 @@ static const char *supported(struct module *mod)
break;
}
}
@@ -93,7 +91,7 @@
}
return NULL;
}
-@@ -1966,7 +1977,7 @@ static void add_staging_flag(struct buff
+@@ -2319,7 +2330,7 @@ static void add_staging_flag(struct buffer *b, const
char *name)
#ifdef CONFIG_SUSE_KERNEL_SUPPORTED
static void add_supported_flag(struct buffer *b, struct module *mod)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/vfs-add-super_operations-get_inode_dev
new/patches.suse/vfs-add-super_operations-get_inode_dev
--- old/patches.suse/vfs-add-super_operations-get_inode_dev 2021-04-14
08:57:33.000000000 +0200
+++ new/patches.suse/vfs-add-super_operations-get_inode_dev 2021-04-26
06:25:46.000000000 +0200
@@ -40,7 +40,7 @@
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -2886,8 +2886,8 @@ static void lock_get_status(struct seq_file *f, struct
file_lock *fl,
+@@ -2891,8 +2891,8 @@ static void lock_get_status(struct seq_file *f, struct
file_lock *fl,
if (inode) {
/* userspace relies on this representation of dev_t */
seq_printf(f, "%d %02x:%02x:%lu ", fl_pid,
@@ -53,7 +53,7 @@
}
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
-@@ -148,7 +148,7 @@ static __be32 *encode_fsid(__be32 *p, struct svc_fh *fhp)
+@@ -260,7 +260,7 @@ static __be32 *encode_fsid(__be32 *p, struct svc_fh *fhp)
default:
case FSIDSOURCE_DEV:
p = xdr_encode_hyper(p, (u64)huge_encode_dev
@@ -64,7 +64,7 @@
p = xdr_encode_hyper(p, (u64) fhp->fh_export->ex_fsid);
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
-@@ -944,7 +944,7 @@ static int wait_for_concurrent_writes(struct file *file)
+@@ -957,7 +957,7 @@ static int wait_for_concurrent_writes(struct file *file)
int err = 0;
if (atomic_read(&inode->i_writecount) > 1
@@ -73,7 +73,7 @@
dprintk("nfsd: write defer %d\n", task_pid_nr(current));
msleep(10);
dprintk("nfsd: write resume %d\n", task_pid_nr(current));
-@@ -955,7 +955,7 @@ static int wait_for_concurrent_writes(struct file *file)
+@@ -968,7 +968,7 @@ static int wait_for_concurrent_writes(struct file *file)
err = vfs_fsync(file, 0);
}
last_ino = inode->i_ino;
@@ -137,9 +137,9 @@
}
--- a/fs/stat.c
+++ b/fs/stat.c
-@@ -35,7 +35,7 @@
- */
- void generic_fillattr(struct inode *inode, struct kstat *stat)
+@@ -43,7 +43,7 @@
+ void generic_fillattr(struct user_namespace *mnt_userns, struct inode *inode,
+ struct kstat *stat)
{
- stat->dev = inode->i_sb->s_dev;
+ stat->dev = inode_get_dev(inode);
@@ -148,7 +148,7 @@
stat->nlink = inode->i_nlink;
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1937,6 +1937,7 @@ struct super_operations {
+@@ -2039,6 +2039,7 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
@@ -156,7 +156,7 @@
};
/*
-@@ -3514,4 +3515,12 @@ static inline int inode_drain_writes(struct inode
*inode)
+@@ -3590,4 +3591,12 @@ static inline int inode_drain_writes(struct inode
*inode)
return filemap_write_and_wait(inode->i_mapping);
}
@@ -220,7 +220,7 @@
),
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
-@@ -845,7 +845,7 @@ DECLARE_EVENT_CLASS(writeback_inode_template,
+@@ -843,7 +843,7 @@ DECLARE_EVENT_CLASS(writeback_inode_template,
),
TP_fast_assign(
@@ -271,7 +271,7 @@
}
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
-@@ -1964,7 +1964,7 @@ static void audit_copy_inode(struct audit_names *name,
+@@ -1950,7 +1950,7 @@ static void audit_copy_inode(struct audit_names *name,
struct inode *inode, unsigned int flags)
{
name->ino = inode->i_ino;
@@ -280,7 +280,7 @@
name->mode = inode->i_mode;
name->uid = inode->i_uid;
name->gid = inode->i_gid;
-@@ -2036,7 +2036,7 @@ void __audit_inode(struct filename *name, const struct
dentry *dentry,
+@@ -2022,7 +2022,7 @@ void __audit_inode(struct filename *name, const struct
dentry *dentry,
if (n->ino) {
/* valid inode number, use that for the comparison */
if (n->ino != inode->i_ino ||
@@ -289,7 +289,7 @@
continue;
} else if (n->name) {
/* inode number has not been set, check the name */
-@@ -2141,7 +2141,7 @@ void __audit_inode_child(struct inode *parent,
+@@ -2127,7 +2127,7 @@ void __audit_inode_child(struct inode *parent,
n->type != AUDIT_TYPE_UNKNOWN))
continue;
@@ -300,7 +300,7 @@
if (n->type == AUDIT_TYPE_UNKNOWN)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -8044,7 +8044,7 @@ static void perf_event_mmap_event(struct perf_mmap_event
*mmap_event)
+@@ -8180,7 +8180,7 @@ static void perf_event_mmap_event(struct perf_mmap_event
*mmap_event)
goto cpy_name;
}
inode = file_inode(vma->vm_file);
@@ -311,7 +311,7 @@
maj = MAJOR(dev);
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
-@@ -97,7 +97,7 @@ static int hwpoison_filter_dev(struct page *p)
+@@ -124,7 +124,7 @@ static int hwpoison_filter_dev(struct page *p)
if (mapping == NULL || mapping->host == NULL)
return -EINVAL;
++++++ series.conf ++++++
++++ 2278 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.12324/series.conf
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.8lRT79/_old 2021-04-29 01:36:56.146453880 +0200
+++ /var/tmp/diff_new_pack.8lRT79/_new 2021-04-29 01:36:56.150453886 +0200
@@ -1,3 +1,3 @@
-2021-04-22 10:30:16 +0000
-GIT Revision: e06d321f0fedc62f2ae9fe030f6d2413efc15633
+2021-04-26 04:25:46 +0000
+GIT Revision: 5d43652877fda8aa556866abab93cad61f1f9b6f
GIT Branch: stable
