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 2022-10-06 07:41:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Thu Oct 6 07:41:12 2022 rev:659 rq:1007640 version:6.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
2022-09-30 17:57:14.709178158 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new.2275/dtb-aarch64.changes
2022-10-06 07:41:15.624561251 +0200
@@ -1,0 +2,17 @@
+Mon Oct 3 07:17:44 CEST 2022 - jsl...@suse.cz
+
+- Refresh
+ patches.suse/vduse-prevent-uninitialized-memory-accesses.patch.
+ Update upstream status.
+- commit 39efccd
+
+-------------------------------------------------------------------
+Sun Oct 2 23:47:05 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0 final
+- eliminate 1 patch
+ - patches.suse/vduse-prevent-uninitialized-memory-accesses.patch
+- refresh configs (headers only)
+- commit a7dafe3
+
+-------------------------------------------------------------------
@@ -362,0 +380,9 @@
+Tue Sep 27 11:58:28 CEST 2022 - ykau...@suse.de
+
+- constraints: increase disk space for all architectures
+ References: bsc#1203693
+ aarch64 is already suffering. SLE15-SP5 x86_64 stats show that it is
+ very close to the limit.
+- commit 43a9011
+
+-------------------------------------------------------------------
@@ -377,0 +404,7 @@
+Sun Sep 25 23:16:50 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0-rc7
+- refresh configs
+- commit 74aafe0
+
+-------------------------------------------------------------------
@@ -444,0 +478,12 @@
+Fri Sep 23 11:25:19 CEST 2022 - dmuel...@suse.com
+
+- config(arm*): disable CONFIG_PM_AUTOSLEEP and CONFIG_PM_WAKELOCKS
(bsc#1189677)
+- commit 1c0b96b
+
+-------------------------------------------------------------------
+Thu Sep 22 16:41:39 CEST 2022 - dmuel...@suse.com
+
+- config.conf: reenable armv6hl configs
+- commit cd71399
+
+-------------------------------------------------------------------
@@ -457 +502,18 @@
-- commit ad624a5
+- commit 66556c1
+
+-------------------------------------------------------------------
+Wed Sep 21 11:48:49 CEST 2022 - dmuel...@suse.com
+
+- arm64: enable CONFIG_ARCH_RENESAS (bsc#1203558)
+ Also compile everything as modules that isn't debug
+ or deprecated that was previously disabled by the
+ global RENESAS disablement.
+- commit b1f13b9
+
+-------------------------------------------------------------------
+Wed Sep 21 11:34:22 CEST 2022 - dmuel...@suse.com
+
+- config.conf: Reenable arm64 configs
+- Update config files, taken from 6.0-rc1 update from x86_64,
+ enabling all new erratas, enabling all new modules
+- commit 9b3cde4
@@ -535,0 +598,6 @@
+Sun Sep 18 22:58:57 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0-rc6
+- commit 2132e28
+
+-------------------------------------------------------------------
@@ -884,0 +953,13 @@
+Sun Sep 11 22:58:16 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0-rc5
+- eliminate 5 patches:
+ - patches.suse/ASoC-nau8540-Implement-hw-constraint-for-rates.patch
+ - patches.suse/ASoC-nau8821-Implement-hw-constraint-for-rates.patch
+ - patches.suse/ASoC-nau8824-Fix-semaphore-unbalance-at-error-paths.patch
+ - patches.suse/ASoC-nau8824-Implement-hw-constraint-for-rates.patch
+ - patches.suse/ASoC-nau8825-Implement-hw-constraint-for-rates.patch
+- refresh configs
+- commit f7dcc92
+
+-------------------------------------------------------------------
@@ -1169 +1250 @@
-- commit 3cbb8c4
+- commit 70d9c50
@@ -1315,0 +1397,7 @@
+Sun Sep 4 22:45:30 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0-rc4
+- refresh configs
+- commit c26d0f0
+
+-------------------------------------------------------------------
@@ -1690,0 +1779,9 @@
+Mon Aug 29 03:45:30 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0-rc3
+- eliminate 2 patches
+ - patches.suse/0001-scsi-sd-Revert-Rework-asynchronous-resume-support.patch
+ - patches.suse/Revert-zram-remove-double-compression-logic.patch
+- commit 824e6f8
+
+-------------------------------------------------------------------
@@ -2309,0 +2407,13 @@
+Thu Aug 25 22:44:58 CEST 2022 - mkube...@suse.cz
+
+- series.conf: cleanup
+- move recently added patches to "almost mainline" section
+ - patches.suse/Revert-zram-remove-double-compression-logic.patch
+ - patches.suse/ASoC-nau8821-Implement-hw-constraint-for-rates.patch
+ - patches.suse/ASoC-nau8824-Fix-semaphore-unbalance-at-error-paths.patch
+ - patches.suse/ASoC-nau8824-Implement-hw-constraint-for-rates.patch
+ - patches.suse/ASoC-nau8825-Implement-hw-constraint-for-rates.patch
+ - patches.suse/ASoC-nau8540-Implement-hw-constraint-for-rates.patch
+- commit 18ca0fb
+
+-------------------------------------------------------------------
@@ -2316,0 +2427,11 @@
+Thu Aug 25 10:08:32 CEST 2022 - ti...@suse.de
+
+- ASoC: nau8540: Implement hw constraint for rates (bsc#1201418).
+- ASoC: nau8825: Implement hw constraint for rates (bsc#1201418).
+- ASoC: nau8824: Implement hw constraint for rates (bsc#1201418).
+- ASoC: nau8824: Fix semaphore unbalance at error paths
+ (bsc#1201418).
+- ASoC: nau8821: Implement hw constraint for rates (bsc#1201418).
+- commit ef72ecc
+
+-------------------------------------------------------------------
@@ -2327,0 +2449,16 @@
+Mon Aug 22 19:48:07 CEST 2022 - vba...@suse.cz
+
+- scsi: sd: Revert "Rework asynchronous resume support"
+ (rc1 testing).
+- commit 4aad010
+
+-------------------------------------------------------------------
+Mon Aug 22 02:56:49 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0-rc2
+- drop upstreamed patch
+ - patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch
+- refresh configs
+- commit 712f762
+
+-------------------------------------------------------------------
@@ -4365,0 +4503,8 @@
+Mon Aug 15 10:47:03 CEST 2022 - dmuel...@suse.com
+
+- config.conf: reenable armv7hl configs
+- Update config files for armv7hl (following x86_64 settings,
+ compiling as module unless DEBUG or DEPRECATED)
+- commit 0329b6a
+
+-------------------------------------------------------------------
@@ -4373,0 +4519,162 @@
+Mon Aug 15 10:22:38 CEST 2022 - dmuel...@suse.com
+
+- armv7hl: rebuilt as an overlay over default config
+ generated automatically with scripts/config-diff
+- commit 1d75725
+
+-------------------------------------------------------------------
+Mon Aug 15 09:38:58 CEST 2022 - dmuel...@suse.com
+
+- armv6/v7: enable BT_VIRTIO
+- commit ba8dcca
+
+-------------------------------------------------------------------
+Mon Aug 15 08:47:46 CEST 2022 - ti...@suse.de
+
+- Refresh and re-apply i8042 quirk patch for ASUS ZenBook (bsc#1190256)
+- commit aeed1e4
+
+-------------------------------------------------------------------
+Mon Aug 15 02:08:48 CEST 2022 - mkube...@suse.cz
+
+- Update to 6.0-rc1
+- eliminate 4 patches (all mainline)
+ -
patches.suse/0001-drm-Always-warn-if-user-defined-modes-are-not-suppor.patch
+ - patches.suse/0001-drm-client-Don-t-add-new-command-line-mode.patch
+ - patches.suse/0001-drm-client-Look-for-command-line-modes-first.patch
+ - patches.suse/ath9k-fix-use-after-free-in-ath9k_hif_usb_rx_cb.patch
+- disable
+ - patches.suse/Input-i8042-Apply-probe-defer-to-more-ASUS-ZenBook-m.patch
+- refresh
+ - patches.suse/add-suse-supported-flag.patch
+ - patches.suse/add-product-identifying-information-to-vmcoreinfo.patch
+ - patches.suse/vfs-add-super_operations-get_inode_dev
+ - patches.suse/Revert-zram-remove-double-compression-logic.patch
++++ 131 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.2275/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.19.tar.sign
linux-5.19.tar.xz
New:
----
linux-6.0.tar.sign
linux-6.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dtb-aarch64.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.616579044 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.620579052 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.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.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -48,7 +48,7 @@
%endif
BuildRequires: xz
Requires: kernel = %version
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
dtb-armv6l.spec: same change
dtb-armv7l.spec: same change
dtb-riscv64.spec: same change
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.732579301 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.736579310 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -110,9 +110,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0-only
Group: System/Kernel
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -239,12 +239,12 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
-Provides: kernel-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides:
kernel-%build_flavor-base-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
+Provides: kernel-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
# END COMMON DEPS
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
%obsolete_rebuilds %name
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
@@ -392,7 +392,6 @@
%endif
%endif
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.764579373 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.772579391 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -110,9 +110,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0-only
Group: System/Kernel
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -239,10 +239,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
-Provides: kernel-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides:
kernel-%build_flavor-base-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
+Provides: kernel-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
# END COMMON DEPS
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@@ -252,7 +252,7 @@
Obsoletes: kernel-kdump-base <= 2.6.28
%endif
%obsolete_rebuilds %name
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
@@ -400,7 +400,6 @@
%endif
%endif
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.800579453 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.804579462 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -110,9 +110,9 @@
Summary: The Standard Kernel
License: GPL-2.0-only
Group: System/Kernel
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -239,10 +239,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
-Provides: kernel-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides:
kernel-%build_flavor-base-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
+Provides: kernel-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
# END COMMON DEPS
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@@ -296,7 +296,7 @@
Obsoletes: kernel-ec2-base <= 4.4
%endif
%obsolete_rebuilds %name
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
@@ -444,7 +444,6 @@
%endif
%endif
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.824579507 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.828579515 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -31,9 +31,9 @@
Summary: Kernel Documentation
License: GPL-2.0-only
Group: Documentation/Man
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -67,10 +67,10 @@
%endif
URL: https://www.kernel.org/
Provides: %name = %version-%source_rel
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
++++++ kernel-kvmsmall.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.852579569 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.856579578 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -110,9 +110,9 @@
Summary: The Small Developer Kernel for KVM
License: GPL-2.0-only
Group: System/Kernel
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -239,12 +239,12 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
-Provides: kernel-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides:
kernel-%build_flavor-base-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
+Provides: kernel-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
# END COMMON DEPS
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
%obsolete_rebuilds %name
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
@@ -392,7 +392,6 @@
%endif
%endif
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.904579684 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.908579693 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 5.19.12
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -45,7 +45,7 @@
%endif
%endif
%endif
-BuildRequires:
kernel%kernel_flavor-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+BuildRequires:
kernel%kernel_flavor-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
%if 0%{?rhel_version}
BuildRequires: kernel
@@ -64,9 +64,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0-only
Group: SLES
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.952579791 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.960579809 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 5.19.12
+%define patchversion 6.0.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0-only
Group: SLES
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:23.984579863 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:23.992579880 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -110,9 +110,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0-only
Group: System/Kernel
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -239,10 +239,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
-Provides: kernel-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides:
kernel-%build_flavor-base-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
+Provides: kernel-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
# END COMMON DEPS
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@@ -266,7 +266,7 @@
Obsoletes: kernel-ec2-base <= 4.4
%endif
%obsolete_rebuilds %name
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
@@ -414,7 +414,6 @@
%endif
%endif
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:24.012579925 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:24.016579934 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -31,9 +31,9 @@
%endif
Name: kernel-source
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -50,12 +50,12 @@
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
Provides: linux
Provides: multiversion(kernel)
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
-%if "https://www.kernel.org/pub/linux/kernel/v5.x/"; != ""
-Source1:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.sign
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
+%if "https://www.kernel.org/pub/linux/kernel/v6.x/"; != ""
+Source1:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.sign
Source2: linux.keyring
%endif
Source3: kernel-source.rpmlintrc
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:24.044579996 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:24.052580014 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0-only
Group: Development/Sources
-Version: 5.19.12
+Version: 6.0.0
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -52,7 +52,7 @@
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:24.076580067 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:24.080580076 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 5.19
-%define patchversion 5.19.12
+%define srcversion 6.0
+%define patchversion 6.0.0
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -110,9 +110,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0-only
Group: System/Kernel
-Version: 5.19.12
+Version: 6.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g95fa5b8
+Release: <RELEASE>.g47c5c19
%else
Release: 0
%endif
@@ -239,12 +239,12 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
-Provides: kernel-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides:
kernel-%build_flavor-base-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
+Provides: kernel-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
# END COMMON DEPS
-Provides: %name-srchash-95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+Provides: %name-srchash-47c5c190085ac244fbca316e6944df1bf3c64167
%obsolete_rebuilds %name
-Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
+Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
Source14: series.conf
Source16: guards
@@ -392,7 +392,6 @@
%endif
%endif
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
kernel-zfcpdump.spec: same change
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:24.284580530 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:24.288580539 +0200
@@ -176,7 +176,7 @@
</hardware>
</overwrite>
- <!-- 45GB for binary packages on aarch64, riscv64 and x86-->
+ <!-- 50GB for binary packages on aarch64, riscv64 and x86-->
<overwrite>
<conditions>
<arch>aarch64</arch>
@@ -193,7 +193,7 @@
</conditions>
<hardware>
<disk>
- <size unit="G">45</size>
+ <size unit="G">50</size>
</disk>
</hardware>
</overwrite>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:24.392580771 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:24.396580780 +0200
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.19
+SRCVERSION=6.0
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# enable kernel module compression
++++++ config.tar.bz2 ++++++
++++ 20712 lines of diff (skipped)
++++++ constraints.in ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:24.756581581 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:24.760581590 +0200
@@ -134,7 +134,7 @@
</hardware>
</overwrite>
- <!-- 45GB for binary packages on aarch64, riscv64 and x86-->
+ <!-- 50GB for binary packages on aarch64, riscv64 and x86-->
<overwrite>
<conditions>
<arch>aarch64</arch>
@@ -144,7 +144,7 @@
</conditions>
<hardware>
<disk>
- <size unit="G">45</size>
+ <size unit="G">50</size>
</disk>
</hardware>
</overwrite>
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:24.856581804 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:24.856581804 +0200
@@ -262,7 +262,6 @@
%endif
%endif
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
++++++ linux-5.19.tar.xz -> linux-6.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/kernel-source/linux-5.19.tar.xz
/work/SRC/openSUSE:Factory/.kernel-source.new.2275/linux-6.0.tar.xz differ:
char 15, line 1
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 250033 lines of diff (skipped)
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch
new/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch
---
old/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch
2022-08-30 08:27:37.000000000 +0200
+++
new/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-From: Jiri Slaby <jsl...@suse.cz>
-Date: Wed, 10 Aug 2022 11:26:03 +0200
-Subject: kbuild: dummy-tools: pretend we understand __LONG_DOUBLE_128__
-Git-commit: 0df499eaf3c1a43ebb0a84ac854262e3fa731bcf
-Patch-mainline: 6.0-rc2
-References: ppc config fix
-
-There is a test in powerpc's Kconfig which checks __LONG_DOUBLE_128__
-and sets CONFIG_PPC_LONG_DOUBLE_128 if it is understood by the compiler.
-
-We currently don't handle it, so this results in PPC_LONG_DOUBLE_128 not
-being in super-config generated by dummy-tools. So take this into
-account in the gcc script and preprocess __LONG_DOUBLE_128__ as "1".
-
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
-Signed-off-by: Masahiro Yamada <masahi...@kernel.org>
----
- scripts/dummy-tools/gcc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/scripts/dummy-tools/gcc
-+++ b/scripts/dummy-tools/gcc
-@@ -59,7 +59,7 @@ fi
- if arg_contain -E "$@"; then
- # For scripts/cc-version.sh; This emulates GCC 20.0.0
- if arg_contain - "$@"; then
-- sed -n '/^GCC/{s/__GNUC__/20/; s/__GNUC_MINOR__/0/;
s/__GNUC_PATCHLEVEL__/0/; p;}'
-+ sed -n '/^GCC/{s/__GNUC__/20/; s/__GNUC_MINOR__/0/;
s/__GNUC_PATCHLEVEL__/0/; p;}; s/__LONG_DOUBLE_128__/1/ p'
- exit 0
- else
- echo "no input files" >&2
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/0001-drm-Always-warn-if-user-defined-modes-are-not-suppor.patch
new/patches.suse/0001-drm-Always-warn-if-user-defined-modes-are-not-suppor.patch
---
old/patches.suse/0001-drm-Always-warn-if-user-defined-modes-are-not-suppor.patch
2022-09-28 12:51:18.000000000 +0200
+++
new/patches.suse/0001-drm-Always-warn-if-user-defined-modes-are-not-suppor.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-From b6415bd7386bcf9d2e0d6ee1d4ef4186e7a87b24 Mon Sep 17 00:00:00 2001
-From: Thomas Zimmermann <tzimmerm...@suse.de>
-Date: Wed, 11 May 2022 20:31:23 +0200
-Subject: drm: Always warn if user-defined modes are not supported
-Git-commit: b6415bd7386bcf9d2e0d6ee1d4ef4186e7a87b24
-Patch-mainline: v6.0-rc1
-References: boo#1193472
-
-Print a warning if a user-specifed display mode is not supported by
-the display pipeline. Users specified the display mode on the kernel
-command line with the use of the video= parameter. Setting an
-unsupported mode will leave the console blank, so we should at least
-let the user know why.
-
-Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
-Reviewed-by: Javier Martinez Canillas <javi...@redhat.com>
-Reviewed-by: Maxime Ripard <max...@cerno.tech>
-Link:
https://patchwork.freedesktop.org/patch/msgid/20220511183125.14294-2-tzimmerm...@suse.de
-Acked-by: Thomas Zimmermann <tzimmerm...@suse.de>
----
- drivers/gpu/drm/drm_modes.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 14b746f7ba975..40b7b245e98c5 100644
---- a/drivers/gpu/drm/drm_modes.c
-+++ b/drivers/gpu/drm/drm_modes.c
-@@ -1328,6 +1328,10 @@ void drm_mode_prune_invalid(struct drm_device *dev,
- list_for_each_entry_safe(mode, t, mode_list, head) {
- if (mode->status != MODE_OK) {
- list_del(&mode->head);
-+ if (mode->type & DRM_MODE_TYPE_USERDEF) {
-+ drm_warn(dev, "User-defined mode not supported:
"
-+ DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));
-+ }
- if (verbose) {
- drm_mode_debug_printmodeline(mode);
- DRM_DEBUG_KMS("Not using %s mode: %s\n",
---
-2.36.1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/0001-drm-client-Don-t-add-new-command-line-mode.patch
new/patches.suse/0001-drm-client-Don-t-add-new-command-line-mode.patch
--- old/patches.suse/0001-drm-client-Don-t-add-new-command-line-mode.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/0001-drm-client-Don-t-add-new-command-line-mode.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-From 0facdaa249c4e97346bc0b49c893e4a1d336b7dd Mon Sep 17 00:00:00 2001
-From: Thomas Zimmermann <tzimmerm...@suse.de>
-Date: Wed, 11 May 2022 20:31:25 +0200
-Subject: drm/client: Don't add new command-line mode
-Git-commit: 0facdaa249c4e97346bc0b49c893e4a1d336b7dd
-Patch-mainline: v6.0-rc1
-References: boo#1193472
-
-Don't add a mode for the kernel's command-line parameters from
-within the DRM client code. Doing so can result in an unusable
-display. If there's no compatible command-line mode, the client
-will use one of the connector's preferred modes.
-
-All mode creation and validation has to be performed by the
-connector. When clients run, the connector's fill_modes callback
-has already processed the kernel parameters and validated each
-mode before adding it. The connector's mode list does not contain
-invalid modes.
-
-v2:
- * grammar in commit message (Javier)
-
-Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
-Reviewed-by: Javier Martinez Canillas <javi...@redhat.com>
-Reviewed-by: Maxime Ripard <max...@cerno.tech>
-Link:
https://patchwork.freedesktop.org/patch/msgid/20220511183125.14294-4-tzimmerm...@suse.de
-Acked-by: Thomas Zimmermann <tzimmerm...@suse.de>
----
- drivers/gpu/drm/drm_client_modeset.c | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_client_modeset.c
b/drivers/gpu/drm/drm_client_modeset.c
-index b777faa87f043..48e6ce16439fd 100644
---- a/drivers/gpu/drm/drm_client_modeset.c
-+++ b/drivers/gpu/drm/drm_client_modeset.c
-@@ -158,8 +158,7 @@ drm_connector_has_preferred_mode(struct drm_connector
*connector, int width, int
- return NULL;
- }
-
--static struct drm_display_mode *
--drm_connector_pick_cmdline_mode(struct drm_connector *connector)
-+static struct drm_display_mode *drm_connector_pick_cmdline_mode(struct
drm_connector *connector)
- {
- struct drm_cmdline_mode *cmdline_mode;
- struct drm_display_mode *mode;
-@@ -180,11 +179,10 @@ drm_connector_pick_cmdline_mode(struct drm_connector
*connector)
- if (cmdline_mode->specified == false)
- return NULL;
-
-- /* attempt to find a matching mode in the list of modes
-- * we have gotten so far, if not add a CVT mode that conforms
-+ /*
-+ * Attempt to find a matching mode in the list of modes we
-+ * have gotten so far.
- */
-- if (cmdline_mode->rb || cmdline_mode->margins)
-- goto create_mode;
-
- prefer_non_interlace = !cmdline_mode->interlace;
- again:
-@@ -218,12 +216,7 @@ drm_connector_pick_cmdline_mode(struct drm_connector
*connector)
- goto again;
- }
-
--create_mode:
-- mode = drm_mode_create_from_cmdline_mode(connector->dev, cmdline_mode);
-- if (mode)
-- list_add(&mode->head, &connector->modes);
--
-- return mode;
-+ return NULL;
- }
-
- static bool drm_connector_enabled(struct drm_connector *connector, bool
strict)
---
-2.36.1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/0001-drm-client-Look-for-command-line-modes-first.patch
new/patches.suse/0001-drm-client-Look-for-command-line-modes-first.patch
--- old/patches.suse/0001-drm-client-Look-for-command-line-modes-first.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/0001-drm-client-Look-for-command-line-modes-first.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-From b959eb4f5b7ea49b47e95c9047d33d1b1cf81057 Mon Sep 17 00:00:00 2001
-From: Thomas Zimmermann <tzimmerm...@suse.de>
-Date: Wed, 11 May 2022 20:31:24 +0200
-Subject: drm/client: Look for command-line modes first
-Git-commit: b959eb4f5b7ea49b47e95c9047d33d1b1cf81057
-Patch-mainline: v6.0-rc1
-References: boo#1193472
-
-When picking a mode, first look for modes that have been specified
-by the user on the kernel's command line. Only if that fails, use
-the existing heuristic of picking a nearby mode from it's various
-parameters.
-
-Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
-Reviewed-by: Javier Martinez Canillas <javi...@redhat.com>
-Reviewed-by: Maxime Ripard <max...@cerno.tech>
-Link:
https://patchwork.freedesktop.org/patch/msgid/20220511183125.14294-3-tzimmerm...@suse.de
-Acked-by: Thomas Zimmermann <tzimmerm...@suse.de>
----
- drivers/gpu/drm/drm_client_modeset.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/drivers/gpu/drm/drm_client_modeset.c
b/drivers/gpu/drm/drm_client_modeset.c
-index e6346a67cd981..b777faa87f043 100644
---- a/drivers/gpu/drm/drm_client_modeset.c
-+++ b/drivers/gpu/drm/drm_client_modeset.c
-@@ -165,6 +165,17 @@ drm_connector_pick_cmdline_mode(struct drm_connector
*connector)
- struct drm_display_mode *mode;
- bool prefer_non_interlace;
-
-+ /*
-+ * Find a user-defined mode. If the user gave us a valid
-+ * mode on the kernel command line, it will show up in this
-+ * list.
-+ */
-+
-+ list_for_each_entry(mode, &connector->modes, head) {
-+ if (mode->type & DRM_MODE_TYPE_USERDEF)
-+ return mode;
-+ }
-+
- cmdline_mode = &connector->cmdline_mode;
- if (cmdline_mode->specified == false)
- return NULL;
---
-2.36.1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/ACPI-processor-idle-Practically-limit-Dummy-wait-wor.patch
new/patches.suse/ACPI-processor-idle-Practically-limit-Dummy-wait-wor.patch
--- old/patches.suse/ACPI-processor-idle-Practically-limit-Dummy-wait-wor.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/ACPI-processor-idle-Practically-limit-Dummy-wait-wor.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
-From e400ad8b7e6a1b9102123c6240289a811501f7d9 Mon Sep 17 00:00:00 2001
-From: Dave Hansen <dave.han...@intel.com>
-Date: Thu, 22 Sep 2022 11:47:45 -0700
-Subject: [PATCH] ACPI: processor idle: Practically limit "Dummy wait"
- workaround to old Intel systems
-Git-commit: e400ad8b7e6a1b9102123c6240289a811501f7d9
-Patch-mainline: v6.0-rc8
-References: bsc#1203767
-
-
-Old, circa 2002 chipsets have a bug: they don't go idle when they are
-supposed to. So, a workaround was added to slow the CPU down and
-ensure that the CPU waits a bit for the chipset to actually go idle.
-This workaround is ancient and has been in place in some form since
-the original kernel ACPI implementation.
-
-But, this workaround is very painful on modern systems. The "inl()"
-can take thousands of cycles (see Link: for some more detailed
-numbers and some fun kernel archaeology).
-
-First and foremost, modern systems should not be using this code.
-Typical Intel systems have not used it in over a decade because it is
-horribly inferior to MWAIT-based idle.
-
-Despite this, people do seem to be tripping over this workaround on
-AMD system today.
-
-Limit the "dummy wait" workaround to Intel systems. Keep Modern AMD
-systems from tripping over the workaround. Remotely modern Intel
-systems use intel_idle instead of this code and will, in practice,
-remain unaffected by the dummy wait.
-
-Reported-by: K Prateek Nayak <kprateek.na...@amd.com>
-Suggested-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
-Signed-off-by: Dave Hansen <dave.han...@linux.intel.com>
-Reviewed-by: Mario Limonciello <mario.limoncie...@amd.com>
-Tested-by: K Prateek Nayak <kprateek.na...@amd.com>
-Acked-by: Dirk Mueller <dmuell...@suse.de>
-Link: https://lore.kernel.org/all/20220921063638.2489-1-kprateek.na...@amd.com/
-Link: https://lkml.kernel.org/r/20220922184745.3252932-1-dave.han...@intel.com
----
- drivers/acpi/processor_idle.c | 23 ++++++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
-index 16a1663d02d4..9f40917c49ef 100644
---- a/drivers/acpi/processor_idle.c
-+++ b/drivers/acpi/processor_idle.c
-@@ -531,10 +531,27 @@ static void wait_for_freeze(void)
- /* No delay is needed if we are in guest */
- if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
- return;
-+ /*
-+ * Modern (>=Nehalem) Intel systems use ACPI via intel_idle,
-+ * not this code. Assume that any Intel systems using this
-+ * are ancient and may need the dummy wait. This also assumes
-+ * that the motivating chipset issue was Intel-only.
-+ */
-+ if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
-+ return;
- #endif
-- /* Dummy wait op - must do something useless after P_LVL2 read
-- because chipsets cannot guarantee that STPCLK# signal
-- gets asserted in time to freeze execution properly. */
-+ /*
-+ * Dummy wait op - must do something useless after P_LVL2 read
-+ * because chipsets cannot guarantee that STPCLK# signal gets
-+ * asserted in time to freeze execution properly
-+ *
-+ * This workaround has been in place since the original ACPI
-+ * implementation was merged, circa 2002.
-+ *
-+ * If a profile is pointing to this instruction, please first
-+ * consider moving your system to a more modern idle
-+ * mechanism.
-+ */
- inl(acpi_gbl_FADT.xpm_timer_block.address);
- }
-
---
-2.37.3
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/Input-i8042-Apply-probe-defer-to-more-ASUS-ZenBook-m.patch
new/patches.suse/Input-i8042-Apply-probe-defer-to-more-ASUS-ZenBook-m.patch
--- old/patches.suse/Input-i8042-Apply-probe-defer-to-more-ASUS-ZenBook-m.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/Input-i8042-Apply-probe-defer-to-more-ASUS-ZenBook-m.patch
2022-10-03 07:21:52.000000000 +0200
@@ -19,9 +19,9 @@
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -997,17 +997,17 @@ static const struct dmi_system_id __init
-
- static const struct dmi_system_id i8042_dmi_probe_defer_table[] __initconst =
{
+@@ -114,18 +114,18 @@ static const struct dmi_system_id i8042_
+ .driver_data = (void *)(SERIO_QUIRK_NOMUX |
SERIO_QUIRK_RESET_NEVER)
+ },
{
- /* ASUS ZenBook UX425UA */
+ /* ASUS ZenBook UX425UA/QA */
@@ -30,6 +30,7 @@
- DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425"),
},
+ .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER |
SERIO_QUIRK_RESET_NEVER)
},
{
- /* ASUS ZenBook UM325UA */
@@ -39,5 +40,5 @@
- DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325"),
},
+ .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER |
SERIO_QUIRK_RESET_NEVER)
},
- { }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/add-product-identifying-information-to-vmcoreinfo.patch
new/patches.suse/add-product-identifying-information-to-vmcoreinfo.patch
--- old/patches.suse/add-product-identifying-information-to-vmcoreinfo.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/add-product-identifying-information-to-vmcoreinfo.patch
2022-10-03 07:21:52.000000000 +0200
@@ -15,15 +15,15 @@
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
-@@ -9,6 +9,7 @@
- #include <linux/init.h>
+@@ -10,6 +10,7 @@
#include <linux/utsname.h>
#include <linux/vmalloc.h>
+ #include <linux/sizes.h>
+#include <linux/suse_version.h>
#include <asm/page.h>
#include <asm/sections.h>
-@@ -408,6 +409,7 @@ static int __init crash_save_vmcoreinfo_init(void)
+@@ -416,6 +417,7 @@ static int __init crash_save_vmcoreinfo_init(void)
}
VMCOREINFO_OSRELEASE(init_uts_ns.name.release);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/add-suse-supported-flag.patch
new/patches.suse/add-suse-supported-flag.patch
--- old/patches.suse/add-suse-supported-flag.patch 2022-09-28
12:51:18.000000000 +0200
+++ new/patches.suse/add-suse-supported-flag.patch 2022-10-03
07:21:52.000000000 +0200
@@ -18,6 +18,7 @@
---
.../admin-guide/kernel-parameters.txt | 8 +
Documentation/admin-guide/sysctl/kernel.rst | 41 ++---
+ Documentation/admin-guide/tainted-kernels.rst | 48 ++---
Makefile | 5 +
include/linux/module.h | 3 +
include/linux/panic.h | 18 ++
@@ -29,11 +30,11 @@
kernel/sysctl.c | 9 +
scripts/Makefile.modpost | 6 +
scripts/mod/modpost.c | 166 +++++++++++++++++-
- 13 files changed, 361 insertions(+), 21 deletions(-)
+ 14 files changed, 386 insertions(+), 44 deletions(-)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -6237,6 +6237,14 @@
+@@ -6391,6 +6391,14 @@
unknown_nmi_panic
[X86] Cause panic on unknown NMI.
@@ -50,7 +51,7 @@
(default -1 = authorized except for wireless USB,
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
-@@ -1330,26 +1330,27 @@ tainted
+@@ -1342,26 +1342,27 @@ tainted
Non-zero if the kernel has been tainted. Numeric values, which can be
ORed together. The letters are seen in "Tainted" line of Oops reports.
@@ -93,14 +94,71 @@
+ 32768 `(K)` kernel has been live patched
+ 65536 `(X)` A kernel module with external support was loaded
+ 131072 `(T)` The kernel was built with the struct randomization plugin
-+2147483648 `(N)` An unsupported kernel module was loaded
++2147483648 `(n)` An unsupported kernel module was loaded
+========== ===== ==========================================================
See Documentation/admin-guide/tainted-kernels.rst for more information.
+--- a/Documentation/admin-guide/tainted-kernels.rst
++++ b/Documentation/admin-guide/tainted-kernels.rst
+@@ -79,29 +79,31 @@ which bits are set::
+ Table for decoding tainted state
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-=== === ====== ========================================================
+-Bit Log Number Reason that got the kernel tainted
+-=== === ====== ========================================================
+- 0 G/P 1 proprietary module was loaded
+- 1 _/F 2 module was force loaded
+- 2 _/S 4 kernel running on an out of specification system
+- 3 _/R 8 module was force unloaded
+- 4 _/M 16 processor reported a Machine Check Exception (MCE)
+- 5 _/B 32 bad page referenced or some unexpected page flags
+- 6 _/U 64 taint requested by userspace application
+- 7 _/D 128 kernel died recently, i.e. there was an OOPS or BUG
+- 8 _/A 256 ACPI table overridden by user
+- 9 _/W 512 kernel issued warning
+- 10 _/C 1024 staging driver was loaded
+- 11 _/I 2048 workaround for bug in platform firmware applied
+- 12 _/O 4096 externally-built ("out-of-tree") module was loaded
+- 13 _/E 8192 unsigned module was loaded
+- 14 _/L 16384 soft lockup occurred
+- 15 _/K 32768 kernel has been live patched
+- 16 _/X 65536 auxiliary taint, defined for and used by distros
+- 17 _/T 131072 kernel was built with the struct randomization plugin
+- 18 _/N 262144 an in-kernel test has been run
+-=== === ====== ========================================================
++=== === ========== ========================================================
++Bit Log Number Reason that got the kernel tainted
++=== === ========== ========================================================
++ 0 G/P 1 proprietary module was loaded
++ 1 _/F 2 module was force loaded
++ 2 _/S 4 kernel running on an out of specification system
++ 3 _/R 8 module was force unloaded
++ 4 _/M 16 processor reported a Machine Check Exception (MCE)
++ 5 _/B 32 bad page referenced or some unexpected page flags
++ 6 _/U 64 taint requested by userspace application
++ 7 _/D 128 kernel died recently, i.e. there was an OOPS or BUG
++ 8 _/A 256 ACPI table overridden by user
++ 9 _/W 512 kernel issued warning
++ 10 _/C 1024 staging driver was loaded
++ 11 _/I 2048 workaround for bug in platform firmware applied
++ 12 _/O 4096 externally-built ("out-of-tree") module was loaded
++ 13 _/E 8192 unsigned module was loaded
++ 14 _/L 16384 soft lockup occurred
++ 15 _/K 32768 kernel has been live patched
++ 16 _/X 65536 auxiliary taint, defined for and used by distros
++ 17 _/T 131072 kernel was built with the struct randomization plugin
++ 18 _/N 262144 an in-kernel test has been run
++ 31 _/n 2147483648 an unsupported kernel module was loaded
++
++=== === ========== ========================================================
+
+ Note: The character ``_`` is representing a blank in this table to make
reading
+ easier.
--- a/Makefile
+++ b/Makefile
-@@ -356,6 +356,11 @@ else # !mixed-build
+@@ -359,6 +359,11 @@ else # !mixed-build
include $(srctree)/scripts/Kbuild.include
@@ -114,7 +172,7 @@
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if
$(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
--- a/include/linux/module.h
+++ b/include/linux/module.h
-@@ -567,6 +567,9 @@ bool is_module_address(unsigned long addr);
+@@ -572,6 +572,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);
@@ -137,8 +195,8 @@
/*
* panic_cpu is used for synchronizing panic() and crash_kexec() execution. It
* holds a CPU number which is executing panic() currently. A value of
-@@ -71,6 +75,20 @@ static inline void set_arch_panic_timeout(int timeout, int
arch_default_timeout)
- #define TAINT_FLAGS_COUNT 18
+@@ -72,6 +76,20 @@ static inline void set_arch_panic_timeout(int timeout, int
arch_default_timeout)
+ #define TAINT_FLAGS_COUNT 19
#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1)
+#ifdef CONFIG_SUSE_KERNEL_SUPPORTED
@@ -249,7 +307,7 @@
/*
* Bounds of module text, for speeding up __module_address.
* Protected by module_mutex.
-@@ -961,6 +977,33 @@ static ssize_t show_taint(struct module_attribute *mattr,
+@@ -966,6 +982,33 @@ static ssize_t show_taint(struct module_attribute *mattr,
static struct module_attribute modinfo_taint =
__ATTR(taint, 0444, show_taint, NULL);
@@ -283,7 +341,7 @@
struct module_attribute *modinfo_attrs[] = {
&module_uevent,
&modinfo_version,
-@@ -972,6 +1015,9 @@ struct module_attribute *modinfo_attrs[] = {
+@@ -977,6 +1020,9 @@ struct module_attribute *modinfo_attrs[] = {
#endif
&modinfo_initsize,
&modinfo_taint,
@@ -293,9 +351,9 @@
#ifdef CONFIG_MODULE_UNLOAD
&modinfo_refcnt,
#endif
-@@ -3128,4 +3174,7 @@ void print_modules(void)
- if (last_unloaded_module[0])
- pr_cont(" [last unloaded: %s]", last_unloaded_module);
+@@ -3159,4 +3205,7 @@ void print_modules(void)
+ pr_cont(" [last unloaded: %s%s]", last_unloaded_module.name,
+ last_unloaded_module.taints);
pr_cont("\n");
+#ifdef CONFIG_SUSE_KERNEL_SUPPORTED
+ printk("Supported: %s\n", supported_printable(get_taint()));
@@ -343,19 +401,19 @@
out_unreg_param:
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -428,6 +428,9 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
- [ TAINT_LIVEPATCH ] = { 'K', ' ', true },
+@@ -429,6 +429,9 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
[ TAINT_AUX ] = { 'X', ' ', true },
[ TAINT_RANDSTRUCT ] = { 'T', ' ', true },
+ [ TAINT_TEST ] = { 'N', ' ', true },
+#ifdef CONFIG_SUSE_KERNEL_SUPPORTED
-+ [ TAINT_NO_SUPPORT ] = { 'N', ' ', true },
++ [ TAINT_NO_SUPPORT ] = { 'n', ' ', true },
+#endif
};
/**
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -1805,6 +1805,15 @@ static struct ctl_table kern_table[] = {
+@@ -1849,6 +1849,15 @@ static struct ctl_table kern_table[] = {
.extra1 = &pid_max_min,
.extra2 = &pid_max_max,
},
@@ -401,7 +459,7 @@
#include "../../include/linux/license.h"
/* Are we using CONFIG_MODVERSIONS? */
-@@ -1957,6 +1959,133 @@ static void mod_set_crcs(struct module *mod)
+@@ -1772,6 +1774,133 @@ static void mod_set_crcs(struct module *mod)
free(buf);
}
@@ -535,7 +593,7 @@
static void read_symbols(const char *modname)
{
const char *symname;
-@@ -2216,6 +2345,15 @@ static void add_exported_symbols(struct buffer *buf,
struct module *mod)
+@@ -2034,6 +2163,15 @@ static void add_exported_symbols(struct buffer *buf,
struct module *mod)
}
}
@@ -551,7 +609,7 @@
/**
* Record CRCs for unresolved symbols
**/
-@@ -2373,6 +2511,9 @@ static void write_mod_c_file(struct module *mod)
+@@ -2191,6 +2329,9 @@ static void write_mod_c_file(struct module *mod)
add_header(&buf, mod);
add_exported_symbols(&buf, mod);
@@ -561,7 +619,7 @@
add_versions(&buf, mod);
add_depends(&buf, mod);
add_moddevtable(&buf, mod);
-@@ -2390,6 +2531,17 @@ static void write_mod_c_file(struct module *mod)
+@@ -2208,6 +2349,17 @@ static void write_mod_c_file(struct module *mod)
free(buf.p);
}
@@ -579,7 +637,7 @@
/* parse Module.symvers file. line format:
* 0x12345678<tab>symbol<tab>module<tab>export<tab>namespace
**/
-@@ -2506,11 +2658,14 @@ int main(int argc, char **argv)
+@@ -2324,11 +2476,14 @@ int main(int argc, char **argv)
struct module *mod;
char *missing_namespace_deps = NULL;
char *dump_write = NULL, *files_source = NULL;
@@ -595,7 +653,7 @@
switch (opt) {
case 'e':
external_module = true;
-@@ -2547,11 +2702,20 @@ int main(int argc, char **argv)
+@@ -2365,11 +2520,20 @@ int main(int argc, char **argv)
case 'd':
missing_namespace_deps = optarg;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-bpf_jit_disasm-Don-t-display-disassembler-four.patch
new/patches.suse/tools-bpf_jit_disasm-Don-t-display-disassembler-four.patch
--- old/patches.suse/tools-bpf_jit_disasm-Don-t-display-disassembler-four.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-bpf_jit_disasm-Don-t-display-disassembler-four.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:32 -0700
-Subject: tools bpf_jit_disasm: Don't display disassembler-four-args feature
- test
-Git-commit: bab211f637dc52cfbae1f0f15a6aef71d7f35a1b
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-The feature check does not seem important enough to display.
-
-Suggested-by: Jiri Olsa <jo...@kernel.org>
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Daniel Borkmann <dan...@iogearbox.net>
-Cc: Quentin Monnet <quen...@isovalent.com>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-7-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/bpf/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tools/bpf/Makefile
-+++ b/tools/bpf/Makefile
-@@ -35,7 +35,7 @@ endif
-
- FEATURE_USER = .bpf
- FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled
--FEATURE_DISPLAY = libbfd disassembler-four-args
-+FEATURE_DISPLAY = libbfd
-
- check_feat := 1
- NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean
resolve_btfids_clean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch
new/patches.suse/tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch
--- old/patches.suse/tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,103 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:31 -0700
-Subject: tools bpf_jit_disasm: Fix compilation error with new binutils
-Git-commit: 96ed066054abf11c7d3e106e3011a51f3f1227a3
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-binutils changed the signature of init_disassemble_info(), which now causes
-compilation to fail for tools/bpf/bpf_jit_disasm.c, e.g. on debian
-unstable.
-
-Relevant binutils commit:
-
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
-
-Wire up the feature test and switch to init_disassemble_info_compat(),
-which were introduced in prior commits, fixing the compilation failure.
-
-I verified that bpf_jit_disasm can still disassemble bpf programs, both
-with the old and new dis-asm.h API. With old binutils there's no change in
-output before/after this patch. When comparing the output from old
-binutils (2.35) to new bintuils with the patch (upstream snapshot) there
-are a few output differences, but they are unrelated to this patch. An
-example hunk is:
-
- f4: mov %r14,%rsi
- f7: mov %r15,%rdx
- fa: mov $0x2a,%ecx
- - ff: callq 0xffffffffea8c4988
- + ff: call 0xffffffffea8c4988
- 104: test %rax,%rax
- 107: jge 0x0000000000000110
- 109: xor %eax,%eax
- - 10b: jmpq 0x0000000000000073
- + 10b: jmp 0x0000000000000073
- 110: cmp $0x16,%rax
-
-However, I had to use an older kernel to generate the bpf_jit_enabled =
-2 output, as that has been broken since 5.18 / 1022a5498f6f745c ("bpf,
-x86_64: Use bpf_jit_binary_pack_alloc").
-
- https://lore.kernel.org/20220703030210.pmjft7qc2eajz...@alap3.anarazel.de
-
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Daniel Borkmann <dan...@iogearbox.net>
-Cc: Jiri Olsa <jo...@kernel.org>
-Cc: Quentin Monnet <quen...@isovalent.com>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-6-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/bpf/Makefile | 5 ++++-
- tools/bpf/bpf_jit_disasm.c | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
---- a/tools/bpf/Makefile
-+++ b/tools/bpf/Makefile
-@@ -34,7 +34,7 @@ else
- endif
-
- FEATURE_USER = .bpf
--FEATURE_TESTS = libbfd disassembler-four-args
-+FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled
- FEATURE_DISPLAY = libbfd disassembler-four-args
-
- check_feat := 1
-@@ -56,6 +56,9 @@ endif
- ifeq ($(feature-disassembler-four-args), 1)
- CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
- endif
-+ifeq ($(feature-disassembler-init-styled), 1)
-+CFLAGS += -DDISASM_INIT_STYLED
-+endif
-
- $(OUTPUT)%.yacc.c: $(srctree)/tools/bpf/%.y
- $(QUIET_BISON)$(YACC) -o $@ -d $<
---- a/tools/bpf/bpf_jit_disasm.c
-+++ b/tools/bpf/bpf_jit_disasm.c
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <limits.h>
-+#include <tools/dis-asm-compat.h>
-
- #define CMD_ACTION_SIZE_BUFFER 10
- #define CMD_ACTION_READ_ALL 3
-@@ -64,7 +65,9 @@ static void get_asm_insns(uint8_t *image
- assert(bfdf);
- assert(bfd_check_format(bfdf, bfd_object));
-
-- init_disassemble_info(&info, stdout, (fprintf_ftype) fprintf);
-+ init_disassemble_info_compat(&info, stdout,
-+ (fprintf_ftype) fprintf,
-+ fprintf_styled);
- info.arch = bfd_get_arch(bfdf);
- info.mach = bfd_get_mach(bfdf);
- info.buffer = image;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-bpftool-Don-t-display-disassembler-four-args-f.patch
new/patches.suse/tools-bpftool-Don-t-display-disassembler-four-args-f.patch
--- old/patches.suse/tools-bpftool-Don-t-display-disassembler-four-args-f.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-bpftool-Don-t-display-disassembler-four-args-f.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:34 -0700
-Subject: tools bpftool: Don't display disassembler-four-args feature test
-Git-commit: 1e1613f64cc8a09d7a60ad01450c3321ca4ad454
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-The feature check does not seem important enough to display.
-
-Requested-by: Jiri Olsa <jo...@kernel.org>
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Tested-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Quentin Monnet <quen...@isovalent.com>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-9-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/bpf/bpftool/Makefile | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/tools/bpf/bpftool/Makefile
-+++ b/tools/bpf/bpftool/Makefile
-@@ -95,8 +95,7 @@ RM ?= rm -f
- FEATURE_USER = .bpftool
- FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled zlib
libcap \
- clang-bpf-co-re
--FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \
-- clang-bpf-co-re
-+FEATURE_DISPLAY = libbfd zlib libcap clang-bpf-co-re
-
- check_feat := 1
- NON_CHECK_FEAT_TARGETS := clean uninstall doc doc-clean doc-install
doc-uninstall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-bpftool-Fix-compilation-error-with-new-binutil.patch
new/patches.suse/tools-bpftool-Fix-compilation-error-with-new-binutil.patch
--- old/patches.suse/tools-bpftool-Fix-compilation-error-with-new-binutil.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-bpftool-Fix-compilation-error-with-new-binutil.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,148 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:33 -0700
-Subject: tools bpftool: Fix compilation error with new binutils
-Git-commit: 600b7b26c07a070d0153daa76b3806c1e52c9e00
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-binutils changed the signature of init_disassemble_info(), which now causes
-compilation to fail for tools/bpf/bpftool/jit_disasm.c, e.g. on debian
-unstable.
-
-Relevant binutils commit:
-
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
-
-Wire up the feature test and switch to init_disassemble_info_compat(),
-which were introduced in prior commits, fixing the compilation failure.
-
-I verified that bpftool can still disassemble bpf programs, both with an
-old and new dis-asm.h API. There are no output changes for plain and json
-formats. When comparing the output from old binutils (2.35)
-to new bintuils with the patch (upstream snapshot) there are a few output
-differences, but they are unrelated to this patch. An example hunk is:
-
- 2f: pop %r14
- 31: pop %r13
- 33: pop %rbx
- - 34: leaveq
- - 35: retq
- + 34: leave
- + 35: ret
-
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Jiri Olsa <jo...@kernel.org>
-Cc: Quentin Monnet <quen...@isovalent.com>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-8-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/bpf/bpftool/Makefile | 5 +++-
- tools/bpf/bpftool/jit_disasm.c | 42
+++++++++++++++++++++++++++++++++--------
- 2 files changed, 38 insertions(+), 9 deletions(-)
-
---- a/tools/bpf/bpftool/Makefile
-+++ b/tools/bpf/bpftool/Makefile
-@@ -93,7 +93,7 @@ INSTALL ?= install
- RM ?= rm -f
-
- FEATURE_USER = .bpftool
--FEATURE_TESTS = libbfd disassembler-four-args zlib libcap \
-+FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled zlib
libcap \
- clang-bpf-co-re
- FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \
- clang-bpf-co-re
-@@ -117,6 +117,9 @@ endif
- ifeq ($(feature-disassembler-four-args), 1)
- CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
- endif
-+ifeq ($(feature-disassembler-init-styled), 1)
-+ CFLAGS += -DDISASM_INIT_STYLED
-+endif
-
- LIBS = $(LIBBPF) -lelf -lz
- LIBS_BOOTSTRAP = $(LIBBPF_BOOTSTRAP) -lelf -lz
---- a/tools/bpf/bpftool/jit_disasm.c
-+++ b/tools/bpf/bpftool/jit_disasm.c
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
- #include <limits.h>
- #include <bpf/libbpf.h>
-+#include <tools/dis-asm-compat.h>
-
- #include "json_writer.h"
- #include "main.h"
-@@ -39,15 +40,12 @@ static void get_exec_path(char *tpath, s
- }
-
- static int oper_count;
--static int fprintf_json(void *out, const char *fmt, ...)
-+static int printf_json(void *out, const char *fmt, va_list ap)
- {
-- va_list ap;
- char *s;
- int err;
-
-- va_start(ap, fmt);
- err = vasprintf(&s, fmt, ap);
-- va_end(ap);
- if (err < 0)
- return -1;
-
-@@ -73,6 +71,32 @@ static int fprintf_json(void *out, const
- return 0;
- }
-
-+static int fprintf_json(void *out, const char *fmt, ...)
-+{
-+ va_list ap;
-+ int r;
-+
-+ va_start(ap, fmt);
-+ r = printf_json(out, fmt, ap);
-+ va_end(ap);
-+
-+ return r;
-+}
-+
-+static int fprintf_json_styled(void *out,
-+ enum disassembler_style style __maybe_unused,
-+ const char *fmt, ...)
-+{
-+ va_list ap;
-+ int r;
-+
-+ va_start(ap, fmt);
-+ r = printf_json(out, fmt, ap);
-+ va_end(ap);
-+
-+ return r;
-+}
-+
- void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes,
- const char *arch, const char *disassembler_options,
- const struct btf *btf,
-@@ -99,11 +123,13 @@ void disasm_print_insn(unsigned char *im
- assert(bfd_check_format(bfdf, bfd_object));
-
- if (json_output)
-- init_disassemble_info(&info, stdout,
-- (fprintf_ftype) fprintf_json);
-+ init_disassemble_info_compat(&info, stdout,
-+ (fprintf_ftype) fprintf_json,
-+ fprintf_json_styled);
- else
-- init_disassemble_info(&info, stdout,
-- (fprintf_ftype) fprintf);
-+ init_disassemble_info_compat(&info, stdout,
-+ (fprintf_ftype) fprintf,
-+ fprintf_styled);
-
- /* Update architecture info for offload. */
- if (arch) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-build-Add-feature-test-for-init_disassemble_in.patch
new/patches.suse/tools-build-Add-feature-test-for-init_disassemble_in.patch
--- old/patches.suse/tools-build-Add-feature-test-for-init_disassemble_in.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-build-Add-feature-test-for-init_disassemble_in.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,96 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:27 -0700
-Subject: tools build: Add feature test for init_disassemble_info API changes
-Git-commit: cfd59ca91467056bb2c36907b2fa67b8e1af9952
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-binutils changed the signature of init_disassemble_info(), which now causes
-compilation failures for tools/{perf,bpf}, e.g. on debian unstable.
-
-Relevant binutils commit:
-
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
-
-This commit adds a feature test to detect the new signature. Subsequent
-commits will use it to fix the build failures.
-
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Jiri Olsa <jo...@kernel.org>
-Cc: Quentin Monnet <quen...@isovalent.com>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-2-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/build/Makefile.feature | 1 +
- tools/build/feature/Makefile | 4 ++++
- tools/build/feature/test-all.c | 4 ++++
- tools/build/feature/test-disassembler-init-styled.c | 13 +++++++++++++
- 4 files changed, 22 insertions(+)
- create mode 100644 tools/build/feature/test-disassembler-init-styled.c
-
---- a/tools/build/Makefile.feature
-+++ b/tools/build/Makefile.feature
-@@ -70,6 +70,7 @@ FEATURE_TESTS_BASIC :=
- libaio \
- libzstd \
- disassembler-four-args \
-+ disassembler-init-styled \
- file-handle
-
- # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -18,6 +18,7 @@ FILES=
- test-libbfd.bin \
- test-libbfd-buildid.bin \
- test-disassembler-four-args.bin \
-+ test-disassembler-init-styled.bin \
- test-reallocarray.bin \
- test-libbfd-liberty.bin \
- test-libbfd-liberty-z.bin \
-@@ -248,6 +249,9 @@ $(OUTPUT)test-libbfd-buildid.bin:
- $(OUTPUT)test-disassembler-four-args.bin:
- $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
-
-+$(OUTPUT)test-disassembler-init-styled.bin:
-+ $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
-+
- $(OUTPUT)test-reallocarray.bin:
- $(BUILD)
-
---- a/tools/build/feature/test-all.c
-+++ b/tools/build/feature/test-all.c
-@@ -166,6 +166,10 @@
- # include "test-disassembler-four-args.c"
- #undef main
-
-+#define main main_test_disassembler_init_styled
-+# include "test-disassembler-init-styled.c"
-+#undef main
-+
- #define main main_test_libzstd
- # include "test-libzstd.c"
- #undef main
---- /dev/null
-+++ b/tools/build/feature/test-disassembler-init-styled.c
-@@ -0,0 +1,13 @@
-+// SPDX-License-Identifier: GPL-2.0
-+#include <stdio.h>
-+#include <dis-asm.h>
-+
-+int main(void)
-+{
-+ struct disassemble_info info;
-+
-+ init_disassemble_info(&info, stdout,
-+ NULL, NULL);
-+
-+ return 0;
-+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-build-Don-t-display-disassembler-four-args-fea.patch
new/patches.suse/tools-build-Don-t-display-disassembler-four-args-fea.patch
--- old/patches.suse/tools-build-Don-t-display-disassembler-four-args-fea.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-build-Don-t-display-disassembler-four-args-fea.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:28 -0700
-Subject: tools build: Don't display disassembler-four-args feature test
-Git-commit: 516ddaadb42405a2713d21eb1a384e88e557440a
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-The feature check does not seem important enough to display. Suggested by
-Jiri Olsa.
-
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Tested-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Jiri Olsa <jo...@kernel.org>
-Cc: Quentin Monnet <quen...@isovalent.com>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-3-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/build/Makefile.feature | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/tools/build/Makefile.feature
-+++ b/tools/build/Makefile.feature
-@@ -135,8 +135,7 @@ FEATURE_DISPLAY ?= \
- get_cpuid \
- bpf \
- libaio \
-- libzstd \
-- disassembler-four-args
-+ libzstd
-
- # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
- # If in the future we need per-feature checks/flags for features not
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-include-add-dis-asm-compat.h-to-handle-version.patch
new/patches.suse/tools-include-add-dis-asm-compat.h-to-handle-version.patch
--- old/patches.suse/tools-include-add-dis-asm-compat.h-to-handle-version.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-include-add-dis-asm-compat.h-to-handle-version.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:29 -0700
-Subject: tools include: add dis-asm-compat.h to handle version differences
-Git-commit: a45b3d6926231c3d024ea0de4f7bd967f83709ee
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-binutils changed the signature of init_disassemble_info(), which now causes
-compilation failures for tools/{perf,bpf}, e.g. on debian unstable.
-
-Relevant binutils commit:
-
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
-
-This commit introduces a wrapper for init_disassemble_info(), to avoid
-spreading #ifdef DISASM_INIT_STYLED to a bunch of places. Subsequent
-commits will use it to fix the build failures.
-
-It likely is worth adding a wrapper for disassember(), to avoid the already
-existing DISASM_FOUR_ARGS_SIGNATURE ifdefery.
-
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Signed-off-by: Ben Hutchings <b...@debian.org>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Jiri Olsa <jo...@kernel.org>
-Cc: Quentin Monnet <quen...@isovalent.com>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-4-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/include/tools/dis-asm-compat.h | 55
+++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
- create mode 100644 tools/include/tools/dis-asm-compat.h
-
---- /dev/null
-+++ b/tools/include/tools/dis-asm-compat.h
-@@ -0,0 +1,55 @@
-+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */
-+#ifndef _TOOLS_DIS_ASM_COMPAT_H
-+#define _TOOLS_DIS_ASM_COMPAT_H
-+
-+#include <stdio.h>
-+#include <dis-asm.h>
-+
-+/* define types for older binutils version, to centralize ifdef'ery a bit */
-+#ifndef DISASM_INIT_STYLED
-+enum disassembler_style {DISASSEMBLER_STYLE_NOT_EMPTY};
-+typedef int (*fprintf_styled_ftype) (void *, enum disassembler_style, const
char*, ...);
-+#endif
-+
-+/*
-+ * Trivial fprintf wrapper to be used as the fprintf_styled_func argument to
-+ * init_disassemble_info_compat() when normal fprintf suffices.
-+ */
-+static inline int fprintf_styled(void *out,
-+ enum disassembler_style style,
-+ const char *fmt, ...)
-+{
-+ va_list args;
-+ int r;
-+
-+ (void)style;
-+
-+ va_start(args, fmt);
-+ r = vfprintf(out, fmt, args);
-+ va_end(args);
-+
-+ return r;
-+}
-+
-+/*
-+ * Wrapper for init_disassemble_info() that hides version
-+ * differences. Depending on binutils version and architecture either
-+ * fprintf_func or fprintf_styled_func will be called.
-+ */
-+static inline void init_disassemble_info_compat(struct disassemble_info *info,
-+ void *stream,
-+ fprintf_ftype unstyled_func,
-+ fprintf_styled_ftype
styled_func)
-+{
-+#ifdef DISASM_INIT_STYLED
-+ init_disassemble_info(info, stream,
-+ unstyled_func,
-+ styled_func);
-+#else
-+ (void)styled_func;
-+ init_disassemble_info(info, stream,
-+ unstyled_func);
-+#endif
-+}
-+
-+#endif /* _TOOLS_DIS_ASM_COMPAT_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tools-perf-Fix-compilation-error-with-new-binutils.patch
new/patches.suse/tools-perf-Fix-compilation-error-with-new-binutils.patch
--- old/patches.suse/tools-perf-Fix-compilation-error-with-new-binutils.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/tools-perf-Fix-compilation-error-with-new-binutils.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,113 +0,0 @@
-From: Andres Freund <and...@anarazel.de>
-Date: Sun, 31 Jul 2022 18:38:30 -0700
-Subject: tools perf: Fix compilation error with new binutils
-Git-commit: 83aa0120487e8bc3f231e72c460add783f71f17c
-Patch-mainline: v6.0-rc1
-References: bsc#1202195
-
-binutils changed the signature of init_disassemble_info(), which now causes
-compilation failures for tools/perf/util/annotate.c, e.g. on debian
-unstable.
-
-Relevant binutils commit:
-
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
-
-Wire up the feature test and switch to init_disassemble_info_compat(),
-which were introduced in prior commits, fixing the compilation failure.
-
-I verified that perf can still disassemble bpf programs by using bpftrace
-under load, recording a perf trace, and then annotating the bpf "function"
-with and without the changes. With old binutils there's no change in output
-before/after this patch. When comparing the output from old binutils (2.35)
-to new bintuils with the patch (upstream snapshot) there are a few output
-differences, but they are unrelated to this patch. An example hunk is:
-
- 1.15 : 55:mov %rbp,%rdx
- 0.00 : 58:add $0xfffffffffffffff8,%rdx
- 0.00 : 5c:xor %ecx,%ecx
- - 1.03 : 5e:callq 0xffffffffe12aca3c
- + 1.03 : 5e:call 0xffffffffe12aca3c
- 0.00 : 63:xor %eax,%eax
- - 2.18 : 65:leaveq
- - 2.82 : 66:retq
- + 2.18 : 65:leave
- + 2.82 : 66:ret
-
-Signed-off-by: Andres Freund <and...@anarazel.de>
-Acked-by: Quentin Monnet <quen...@isovalent.com>
-Cc: Alexei Starovoitov <a...@kernel.org>
-Cc: Ben Hutchings <b...@debian.org>
-Cc: Jiri Olsa <jo...@kernel.org>
-Cc: Sedat Dilek <sedat.di...@gmail.com>
-Cc: b...@vger.kernel.org
-Link:
http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og...@alap3.anarazel.de
-Link: https://lore.kernel.org/r/20220801013834.156015-5-and...@anarazel.de
-Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
----
- tools/perf/Makefile.config | 8 ++++++++
- tools/perf/util/annotate.c | 7 ++++---
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
---- a/tools/perf/Makefile.config
-+++ b/tools/perf/Makefile.config
-@@ -298,6 +298,7 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYT
- FEATURE_CHECK_LDFLAGS-libaio = -lrt
-
- FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl
-+FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl
-
- CORE_CFLAGS += -fno-omit-frame-pointer
- CORE_CFLAGS += -ggdb3
-@@ -905,13 +906,16 @@ ifndef NO_LIBBFD
- ifeq ($(feature-libbfd-liberty), 1)
- EXTLIBS += -lbfd -lopcodes -liberty
- FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl
-+ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl
- else
- ifeq ($(feature-libbfd-liberty-z), 1)
- EXTLIBS += -lbfd -lopcodes -liberty -lz
- FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl
-+ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -lz -ldl
- endif
- endif
- $(call feature_check,disassembler-four-args)
-+ $(call feature_check,disassembler-init-styled)
- endif
-
- ifeq ($(feature-libbfd-buildid), 1)
-@@ -1025,6 +1029,10 @@ ifeq ($(feature-disassembler-four-args),
- CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
- endif
-
-+ifeq ($(feature-disassembler-init-styled), 1)
-+ CFLAGS += -DDISASM_INIT_STYLED
-+endif
-+
- ifeq (${IS_64_BIT}, 1)
- ifndef NO_PERF_READ_VDSO32
- $(call feature_check,compile-32)
---- a/tools/perf/util/annotate.c
-+++ b/tools/perf/util/annotate.c
-@@ -1720,6 +1720,7 @@ fallback:
- #include <bpf/btf.h>
- #include <bpf/libbpf.h>
- #include <linux/btf.h>
-+#include <tools/dis-asm-compat.h>
-
- static int symbol__disassemble_bpf(struct symbol *sym,
- struct annotate_args *args)
-@@ -1762,9 +1763,9 @@ static int symbol__disassemble_bpf(struc
- ret = errno;
- goto out;
- }
-- init_disassemble_info(&info, s,
-- (fprintf_ftype) fprintf);
--
-+ init_disassemble_info_compat(&info, s,
-+ (fprintf_ftype) fprintf,
-+ fprintf_styled);
- info.arch = bfd_get_arch(bfdf);
- info.mach = bfd_get_mach(bfdf);
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/vduse-prevent-uninitialized-memory-accesses.patch
new/patches.suse/vduse-prevent-uninitialized-memory-accesses.patch
--- old/patches.suse/vduse-prevent-uninitialized-memory-accesses.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/vduse-prevent-uninitialized-memory-accesses.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-From: Maxime Coquelin <maxime.coque...@redhat.com>
-Date: Wed, 31 Aug 2022 17:49:23 +0200
-Subject: [PATCH] vduse: prevent uninitialized memory accesses
-Message-Id: <20220831154923.97809-1-maxime.coque...@redhat.com>
-Patch-mainline: Submitted, virtualization ML
-References: CVE-2022-2308 bsc#1202573
-
-If the VDUSE application provides a smaller config space
-than the driver expects, the driver may use uninitialized
-memory from the stack.
-
-This patch prevents it by initializing the buffer passed by
-the driver to store the config value.
-
-This fix addresses CVE-2022-2308.
-
-Cc: sta...@vger.kernel.org # v5.15+
-Fixes: c8a6153b6c59 ("vduse: Introduce VDUSE - vDPA Device in Userspace")
-Reviewed-by: Xie Yongji <xieyon...@bytedance.com>
-Acked-by: Jason Wang <jasow...@redhat.com>
-Signed-off-by: Maxime Coquelin <maxime.coque...@redhat.com>
-Signed-off-by: Takashi Iwai <ti...@suse.de>
-
----
- drivers/vdpa/vdpa_user/vduse_dev.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c
b/drivers/vdpa/vdpa_user/vduse_dev.c
-index 41c0b29739f1..35dceee3ed56 100644
---- a/drivers/vdpa/vdpa_user/vduse_dev.c
-+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
-@@ -673,10 +673,15 @@ static void vduse_vdpa_get_config(struct vdpa_device
*vdpa, unsigned int offset,
- {
- struct vduse_dev *dev = vdpa_to_vduse(vdpa);
-
-- if (offset > dev->config_size ||
-- len > dev->config_size - offset)
-+ /* Initialize the buffer in case of partial copy. */
-+ memset(buf, 0, len);
-+
-+ if (offset > dev->config_size)
- return;
-
-+ if (len > dev->config_size - offset)
-+ len = dev->config_size - offset;
-+
- memcpy(buf, dev->config + offset, len);
- }
-
---
-2.35.3
-
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 2022-09-28
12:51:18.000000000 +0200
+++ new/patches.suse/vfs-add-super_operations-get_inode_dev 2022-10-03
07:21:52.000000000 +0200
@@ -127,7 +127,7 @@
fl->fl_owner, fl->fl_flags, fl->fl_type,
fl->fl_pid);
}
-@@ -2700,8 +2702,8 @@ static void lock_get_status(struct seq_file *f, struct
file_lock *fl,
+@@ -2734,8 +2736,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,
@@ -151,10 +151,10 @@
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
-@@ -2485,10 +2485,11 @@ static void nfs4_show_fname(struct seq_file *s, struct
nfsd_file *f)
+@@ -2572,10 +2572,11 @@ static void nfs4_show_fname(struct seq_file *s, struct
nfsd_file *f)
static void nfs4_show_superblock(struct seq_file *s, struct nfsd_file *f)
{
- struct inode *inode = f->nf_inode;
+ struct inode *inode = file_inode(f->nf_file);
+ dev_t dev = inode_get_dev(inode);
seq_printf(s, "superblock: \"%02x:%02x:%ld\"",
@@ -167,7 +167,7 @@
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
-@@ -951,7 +951,7 @@ static int wait_for_concurrent_writes(struct file *file)
+@@ -942,7 +942,7 @@ static int wait_for_concurrent_writes(struct file *file)
int err = 0;
if (atomic_read(&inode->i_writecount) > 1
@@ -176,7 +176,7 @@
dprintk("nfsd: write defer %d\n", task_pid_nr(current));
msleep(10);
dprintk("nfsd: write resume %d\n", task_pid_nr(current));
-@@ -962,7 +962,7 @@ static int wait_for_concurrent_writes(struct file *file)
+@@ -953,7 +953,7 @@ static int wait_for_concurrent_writes(struct file *file)
err = vfs_fsync(file, 0);
}
last_ino = inode->i_ino;
@@ -202,12 +202,12 @@
seq_printf(m, "fanotify ino:%lx sdev:%x mflags:%x mask:%x
ignored_mask:%x ",
- inode->i_ino, inode->i_sb->s_dev,
+ inode->i_ino, inode_get_dev(inode),
- mflags, mark->mask, mark->ignored_mask);
+ mflags, mark->mask, mark->ignore_mask);
show_mark_fhandle(m, inode);
seq_putc(m, '\n');
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
-@@ -41,7 +41,7 @@ static int nommu_region_show(struct seq_file *m, struct
vm_region *region)
+@@ -40,7 +40,7 @@ static int nommu_region_show(struct seq_file *m, struct
vm_region *region)
if (file) {
struct inode *inode = file_inode(region->vm_file);
@@ -267,7 +267,7 @@
stat->nlink = inode->i_nlink;
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2102,6 +2102,7 @@ struct super_operations {
+@@ -2256,6 +2256,7 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
@@ -275,7 +275,7 @@
};
/*
-@@ -3455,4 +3456,12 @@ extern int vfs_fadvise(struct file *file, loff_t
offset, loff_t len,
+@@ -3594,4 +3595,12 @@ extern int vfs_fadvise(struct file *file, loff_t
offset, loff_t len,
extern int generic_fadvise(struct file *file, loff_t offset, loff_t len,
int advice);
@@ -448,7 +448,7 @@
if (n->type == AUDIT_TYPE_UNKNOWN)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -8361,7 +8361,7 @@ static void perf_event_mmap_event(struct perf_mmap_event
*mmap_event)
+@@ -8375,7 +8375,7 @@ static void perf_event_mmap_event(struct perf_mmap_event
*mmap_event)
goto cpy_name;
}
inode = file_inode(vma->vm_file);
@@ -459,7 +459,7 @@
maj = MAJOR(dev);
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
-@@ -134,7 +134,7 @@ static int hwpoison_filter_dev(struct page *p)
+@@ -146,7 +146,7 @@ static int hwpoison_filter_dev(struct page *p)
if (mapping == NULL || mapping->host == NULL)
return -EINVAL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/watchdog-wdat_wdt-fix-min-max-timer-value.patch
new/patches.suse/watchdog-wdat_wdt-fix-min-max-timer-value.patch
--- old/patches.suse/watchdog-wdat_wdt-fix-min-max-timer-value.patch
2022-09-28 12:51:18.000000000 +0200
+++ new/patches.suse/watchdog-wdat_wdt-fix-min-max-timer-value.patch
2022-10-03 07:21:52.000000000 +0200
@@ -71,7 +71,7 @@
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
-@@ -342,9 +342,8 @@
+@@ -342,9 +342,8 @@ static int wdat_wdt_probe(struct platfor
return -EINVAL;
wdat->period = tbl->timer_period;
++++++ series.conf ++++++
++++ 2479 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.2275/series.conf
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.pDjtV6/_old 2022-10-06 07:41:26.172584734 +0200
+++ /var/tmp/diff_new_pack.pDjtV6/_new 2022-10-06 07:41:26.176584743 +0200
@@ -1,4 +1,4 @@
-2022-09-28 10:51:18 +0000
-GIT Revision: 95fa5b88eb9048aecd74e0a611f6a692fd47fcaa
+2022-10-03 05:22:49 +0000
+GIT Revision: 47c5c190085ac244fbca316e6944df1bf3c64167
GIT Branch: stable
