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-03-03 18:33:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Wed Mar 3 18:33:14 2021 rev:577 rq:875337 version:5.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2021-02-15 23:13:28.815143090 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.2378/dtb-aarch64.changes 2021-03-03 18:33:16.179313439 +0100 @@ -1,0 +2,150 @@ +Fri Feb 26 11:10:58 CET 2021 - [email protected] + +- Linux 5.11.2 (bsc#1012628). +- KVM: Use kvm_pfn_t for local PFN variable in + hva_to_pfn_remapped() (bsc#1012628). +- mm: provide a saner PTE walking API for modules (bsc#1012628). +- KVM: do not assume PTE is writable after follow_pfn + (bsc#1012628). +- KVM: x86: Zap the oldest MMU pages, not the newest + (bsc#1012628). +- hwmon: (dell-smm) Add XPS 15 L502X to fan control blacklist + (bsc#1012628). +- arm64: tegra: Add power-domain for Tegra210 HDA (bsc#1012628). +- Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop working + (bsc#1012628). +- ntfs: check for valid standard information attribute + (bsc#1012628). +- usb: quirks: add quirk to start video capture on ELMO L-12F + document camera reliable (bsc#1012628). +- USB: quirks: sort quirk entries (bsc#1012628). +- HID: make arrays usage and value to be the same (bsc#1012628). +- bpf: Fix truncation handling for mod32 dst reg wrt zero + (bsc#1012628). +- commit 6fd6105 + +------------------------------------------------------------------- +Fri Feb 26 10:12:28 CET 2021 - [email protected] + +- config: refresh +- fix misspelled USB gadget debugging options +- commit 20be8e3 + +------------------------------------------------------------------- +Wed Feb 24 16:36:03 CET 2021 - [email protected] + +- Update config files. Update config files. Enable USB_GADGET(jsc#SLE-14042) +- supported.conf: + After discussion what the feature request implied, it was + decided that gadget mode is also needed on x86_64 +- commit 4adcbc0 + +------------------------------------------------------------------- +Wed Feb 24 14:09:57 CET 2021 - [email protected] + +- macros.kernel-source: Use spec_install_pre for certificate installation (boo#1182672). + Since rpm 4.16 files installed during build phase are lost. +- commit d0b887e + +------------------------------------------------------------------- +Wed Feb 24 00:11:36 CET 2021 - [email protected] + +- update mainline references +- update mainline references: + 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 +- commit 4eacbc9 + +------------------------------------------------------------------- +Tue Feb 23 18:12:58 CET 2021 - [email protected] + +- Linux 5.11.1 (bsc#1012628). +- Xen/x86: don't bail early from clear_foreign_p2m_mapping() + (bsc#1012628). +- Xen/x86: also check kernel mapping in set_foreign_p2m_mapping() + (bsc#1012628). +- Xen/gntdev: correct dev_bus_addr handling in + gntdev_map_grant_pages() (bsc#1012628). +- Xen/gntdev: correct error checking in gntdev_map_grant_pages() + (bsc#1012628). +- xen/arm: don't ignore return errors from set_phys_to_machine + (bsc#1012628). +- xen-blkback: don't "handle" error by BUG() (bsc#1012628). +- xen-netback: don't "handle" error by BUG() (bsc#1012628). +- xen-scsiback: don't "handle" error by BUG() (bsc#1012628). +- xen-blkback: fix error handling in xen_blkbk_map() + (bsc#1012628). +- tty: protect tty_write from odd low-level tty disciplines + (bsc#1012628). +- Bluetooth: btusb: Always fallback to alt 1 for WBS + (bsc#1012628). +- commit 3652ea1 + +------------------------------------------------------------------- +Mon Feb 22 12:03:41 CET 2021 - [email protected] + +- arm: Update config files. + Set CONFIG_WATCHDOG_SYSFS to true (bsc#1182560) +- commit 702d1a3 + +------------------------------------------------------------------- +Mon Feb 22 11:16:23 CET 2021 - [email protected] + +- rpm/kernel-subpackage-build: Workaround broken bot + (https://github.com/openSUSE/openSUSE-release-tools/issues/2439) +- commit b74d860 + +------------------------------------------------------------------- +Wed Feb 17 10:52:06 CET 2021 - [email protected] + +- Update config files: Set reset-raspberrypi as builtin (bsc#1180336) + This driver is needed in order to boot through USB. Ideally the kernel + module should be selected by dracut, but it's not. So make it builtin + until the relevant dracut fixes are available. +- commit 8186eab + +------------------------------------------------------------------- +Tue Feb 16 10:22:15 CET 2021 - [email protected] + +- series.conf: cleanup +- move patches on the way to mainline into respective section + patches.suse/drm-bail-out-of-nouveau_channel_new-if-channel-init-.patch + patches.suse/media-uvcvideo-Accept-invalid-bFormatIndex-and-bFram.patch + patches.suse/media-dvb-usb-Fix-memory-leak-at-error-in-dvb_usb_de.patch + patches.suse/media-dvb-usb-Fix-use-after-free-access.patch + patches.suse/media-pwc-Use-correct-device-for-DMA.patch +- commit 8309a4e + +------------------------------------------------------------------- +Mon Feb 15 20:23:21 CET 2021 - [email protected] + +- kernel-binary.spec: Add back initrd and image symlink ghosts to + filelist (bsc#1182140). + Fixes: 76a9256314c3 ("rpm/kernel-{source,binary}.spec: do not include ghost symlinks (boo#1179082).") +- commit 606c9d1 + +------------------------------------------------------------------- +Mon Feb 15 14:38:16 CET 2021 - [email protected] + +- rpm/post.sh: Avoid purge-kernel for the first installed kernel (bsc#1180058) +- commit c29e77d + +------------------------------------------------------------------- +Mon Feb 15 08:07:01 CET 2021 - [email protected] + +- Refresh + patches.suse/drm-bail-out-of-nouveau_channel_new-if-channel-init-.patch. +- Refresh + patches.suse/media-uvcvideo-Accept-invalid-bFormatIndex-and-bFram.patch. + Update upstream status. +- commit 1916d9d + +------------------------------------------------------------------- +Sun Feb 14 23:47:22 CET 2021 - [email protected] + +- Update to 5.11 final +- refresh configs +- commit 253d8c6 + +------------------------------------------------------------------- @@ -95 +245 @@ -- commit 2d8fb7a +- commit 52688e6 @@ -101 +251 @@ -- commit 4a7417d +- commit 721eebd @@ -113 +263 @@ -- commit d24d9b2 +- commit fa9dd94 @@ -126 +276 @@ -- commit 7119d5a +- commit 7800832 @@ -134 +284 @@ -- commit 7cc21b5 +- commit ad4ea5b @@ -368,0 +519,7 @@ +Sun Feb 7 23:11:01 CET 2021 - [email protected] + +- Update to 5.11-rc7 +- refresh configs +- commit 68cabb0 + +------------------------------------------------------------------- @@ -734,0 +892,12 @@ +Sun Jan 31 23:32:11 CET 2021 - [email protected] + +- Update to 5.11-rc6 +- eliminated 1 patch + - patches.suse/iwlwifi-dbg-Don-t-touch-the-tlv-data.patch +- refresh + - patches.suse/acpi_thermal_passive_blacklist.patch +- update configs + - LEDS_RT8515=m +- commit 8d79a70 + +------------------------------------------------------------------- @@ -794,0 +964,16 @@ +Fri Jan 29 08:59:18 CET 2021 - [email protected] + +- series.conf: cleanup +- move to "almost mainline" section: + patches.suse/floppy-reintroduce-O_NDELAY-fix.patch +- commit 26dd464 + +------------------------------------------------------------------- +Thu Jan 28 12:07:05 CET 2021 - [email protected] + ++++ 262 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.2378/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.10.tar.xz New: ---- linux-5.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:32.787320425 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:32.791320427 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change dtb-riscv64.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:32.875320462 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:32.875320462 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 -Provides: kernel-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: kernel-%build_flavor-base-srchash-ee0b277e036ac6832c4219283961bc990f56901d +Provides: kernel-srchash-ee0b277e036ac6832c4219283961bc990f56901d # END COMMON DEPS -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -969,7 +969,9 @@ sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \ add_dirs_to_filelist >> %my_builddir/kernel-devel.files -{ cd %buildroot +{ echo %ghost /boot/$image$suffix + echo %ghost /boot/initrd$suffix + cd %buildroot for f in boot/*; do if test -L "$f"; then echo "%%ghost /$f" ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:32.899320472 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:32.899320472 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 -Provides: kernel-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: kernel-%build_flavor-base-srchash-ee0b277e036ac6832c4219283961bc990f56901d +Provides: kernel-srchash-ee0b277e036ac6832c4219283961bc990f56901d # END COMMON DEPS -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -975,7 +975,9 @@ sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \ add_dirs_to_filelist >> %my_builddir/kernel-devel.files -{ cd %buildroot +{ echo %ghost /boot/$image$suffix + echo %ghost /boot/initrd$suffix + cd %buildroot for f in boot/*; do if test -L "$f"; then echo "%%ghost /$f" ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:32.919320481 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:32.919320481 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 -Provides: kernel-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: kernel-%build_flavor-base-srchash-ee0b277e036ac6832c4219283961bc990f56901d +Provides: kernel-srchash-ee0b277e036ac6832c4219283961bc990f56901d # END COMMON DEPS -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -1018,7 +1018,9 @@ sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \ add_dirs_to_filelist >> %my_builddir/kernel-devel.files -{ cd %buildroot +{ echo %ghost /boot/$image$suffix + echo %ghost /boot/initrd$suffix + cd %buildroot for f in boot/*; do if test -L "$f"; then echo "%%ghost /$f" ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:32.939320489 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:32.939320489 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 5.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d 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.gY9a6d/_old 2021-03-03 18:33:32.959320497 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:32.959320497 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 -Provides: kernel-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: kernel-%build_flavor-base-srchash-ee0b277e036ac6832c4219283961bc990f56901d +Provides: kernel-srchash-ee0b277e036ac6832c4219283961bc990f56901d # END COMMON DEPS -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -973,7 +973,9 @@ sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \ add_dirs_to_filelist >> %my_builddir/kernel-devel.files -{ cd %buildroot +{ echo %ghost /boot/$image$suffix + echo %ghost /boot/initrd$suffix + cd %buildroot for f in boot/*; do if test -L "$f"; then echo "%%ghost /$f" kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:32.999320514 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.003320516 +0100 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.10.16 +%define patchversion 5.11.2 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +BuildRequires: kernel%kernel_flavor-srchash-ee0b277e036ac6832c4219283961bc990f56901d %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.035320529 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.039320531 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.10.16 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.059320539 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.063320541 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 -Provides: kernel-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: kernel-%build_flavor-base-srchash-ee0b277e036ac6832c4219283961bc990f56901d +Provides: kernel-srchash-ee0b277e036ac6832c4219283961bc990f56901d # END COMMON DEPS -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -995,7 +995,9 @@ sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \ add_dirs_to_filelist >> %my_builddir/kernel-devel.files -{ cd %buildroot +{ echo %ghost /boot/$image$suffix + echo %ghost /boot/initrd$suffix + cd %buildroot for f in boot/*; do if test -L "$f"; then echo "%%ghost /$f" ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.079320548 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.083320550 +0100 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -268,6 +268,10 @@ popd find %{buildroot}/usr/src/linux* -type f -name '*.[ch]' -perm /0111 -exec chmod -v a-x {} + +# OBS checks don't like /usr/bin/env in script interpreter lines +grep -Elr '^#! */usr/bin/env ' %{buildroot}/usr/src/linux* | while read f; do + sed -re '1 { s_^#! */usr/bin/env +/_#!/_ ; s_^#! */usr/bin/env +([^/])_#!/usr/bin/\1_ }' -i "$f" +done # kernel-source and kernel-$flavor-devel are built independently, but the # shipped sources (/usr/src/linux/) need to be older than generated files # (/usr/src/linux-obj). We rely on the git commit timestamp to not point into ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.103320558 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.103320558 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 5.10.16 +Version: 5.11.2 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -52,7 +52,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.123320567 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.123320567 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.10 -%define patchversion 5.10.16 +%define srcversion 5.11 +%define patchversion 5.11.2 %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.10.16 +Version: 5.11.2 %if 0%{?is_kotd} -Release: <RELEASE>.g11381f3 +Release: <RELEASE>.gee0b277 %else Release: 0 %endif @@ -179,10 +179,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 -Provides: kernel-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: kernel-%build_flavor-base-srchash-ee0b277e036ac6832c4219283961bc990f56901d +Provides: kernel-srchash-ee0b277e036ac6832c4219283961bc990f56901d # END COMMON DEPS -Provides: %name-srchash-11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +Provides: %name-srchash-ee0b277e036ac6832c4219283961bc990f56901d %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -966,7 +966,9 @@ sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \ add_dirs_to_filelist >> %my_builddir/kernel-devel.files -{ cd %buildroot +{ echo %ghost /boot/$image$suffix + echo %ghost /boot/initrd$suffix + cd %buildroot for f in boot/*; do if test -L "$f"; then echo "%%ghost /$f" kernel-zfcpdump.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.327320652 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.327320652 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=5.10 +SRCVERSION=5.11 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression ++++++ config.tar.bz2 ++++++ ++++ 8751 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.691320805 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.691320805 +0100 @@ -824,7 +824,9 @@ sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \ add_dirs_to_filelist >> %my_builddir/kernel-devel.files -{ cd %buildroot +{ echo %ghost /boot/$image$suffix + echo %ghost /boot/initrd$suffix + cd %buildroot for f in boot/*; do if test -L "$f"; then echo "%%ghost /$f" ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.815320857 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.815320857 +0100 @@ -268,6 +268,10 @@ popd find %{buildroot}/usr/src/linux* -type f -name '*.[ch]' -perm /0111 -exec chmod -v a-x {} + +# OBS checks don't like /usr/bin/env in script interpreter lines +grep -Elr '^#! */usr/bin/env ' %{buildroot}/usr/src/linux* | while read f; do + sed -re '1 { s_^#! */usr/bin/env +/_#!/_ ; s_^#! */usr/bin/env +([^/])_#!/usr/bin/\1_ }' -i "$f" +done # kernel-source and kernel-$flavor-devel are built independently, but the # shipped sources (/usr/src/linux/) need to be older than generated files # (/usr/src/linux-obj). We rely on the git commit timestamp to not point into ++++++ kernel-subpackage-build ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.839320867 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.843320869 +0100 @@ -52,10 +52,8 @@ case $ghost in /boot/image-%build_flavor | /boot/vmlinux-%build_flavor | /boot/vmlinuz-%build_flavor | \ /boot/Image-%build_flavor | /boot/initrd-%build_flavor) - ln -s $(basename $ghost -%build_flavor)-$KREL $RPM_BUILD_ROOT$ghost ;; /boot/vmlinux | /boot/vmlinuz | /boot/zImage | /boot/Image | /boot/image | /boot/initrd) - ln -s $ghost-$KREL $RPM_BUILD_ROOT$ghost ;; /boot/vmlinux-$KREL) [ -f /boot/vmlinux-$KREL.gz ] && touch vmlinux-$KREL ++++++ linux-5.10.tar.xz -> linux-5.11.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-5.10.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new.2378/linux-5.11.tar.xz differ: char 8, line 1 ++++++ macros.kernel-source ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:33.915320900 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:33.915320900 +0100 @@ -77,7 +77,7 @@ : -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_build_pre %%__spec_build_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. ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 152600 lines of diff (skipped) ++++++ 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-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/acpi_thermal_passive_blacklist.patch 2021-02-24 00:11:36.000000000 +0100 @@ -4,7 +4,7 @@ Patch-mainline: not yet, <jeffm: awaiting feedback from trenn, Oct 4, 2017> --- - drivers/acpi/thermal.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ + drivers/acpi/thermal.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) --- a/drivers/acpi/thermal.c @@ -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 +@@ -1041,6 +1042,85 @@ static void acpi_thermal_check_fn(struct work_struct *work) mutex_unlock(&tz->thermal_check_lock); } @@ -103,7 +103,7 @@ static int acpi_thermal_add(struct acpi_device *device) { int result = 0; -@@ -1070,6 +1150,18 @@ static int acpi_thermal_add(struct acpi_ +@@ -1070,6 +1150,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-btrfs-use-the-new-VFS-super_block_dev.patch new/patches.suse/btrfs-btrfs-use-the-new-VFS-super_block_dev.patch --- old/patches.suse/btrfs-btrfs-use-the-new-VFS-super_block_dev.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/btrfs-btrfs-use-the-new-VFS-super_block_dev.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,172 +0,0 @@ -From: "Luis R. Rodriguez" <[email protected]> -Date: Wed, 13 Aug 2014 16:05:22 -0400 -Subject: btrfs: use the new VFS super_block_dev -Patch-mainline: Never, submitted but not accepted -References: bsc#865869 - -Use the new VFS layer struct super_block_dev instead of carrying -the anonymous bdev's on our own. This makes the VFS layer aware of -all of our anonymous dev's on the super block. - -Signed-off-by: Luis R. Rodriguez <[email protected]> -Signed-off-by: Filipe Manana <[email protected]> -fdmanana: fix for running qgroup sanity tests ---- - fs/btrfs/ctree.h | 7 ++----- - fs/btrfs/disk-io.c | 11 ++++++----- - fs/btrfs/inode.c | 5 ++--- - fs/btrfs/ioctl.c | 7 +++++-- - fs/btrfs/super.c | 2 +- - fs/super.c | 18 +++++++++++++++++- - include/linux/fs.h | 2 ++ - 7 files changed, 35 insertions(+), 17 deletions(-) - ---- a/fs/btrfs/ctree.h -+++ b/fs/btrfs/ctree.h -@@ -1110,11 +1110,8 @@ struct btrfs_root { - * protected by inode_lock - */ - struct radix_tree_root delayed_nodes_tree; -- /* -- * right now this just gets used so that a root has its own devid -- * for stat. It may be used for more later -- */ -- dev_t anon_dev; -+ -+ struct super_block_dev sbdev; - - spinlock_t root_item_lock; - refcount_t refs; ---- a/fs/btrfs/disk-io.c -+++ b/fs/btrfs/disk-io.c -@@ -1084,9 +1084,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; -- root->anon_dev = 0; - - spin_lock_init(&root->root_item_lock); -+ init_anon_sbdev(&root->sbdev); - btrfs_qgroup_init_swapped_blocks(&root->swapped_blocks); - #ifdef CONFIG_BTRFS_DEBUG - INIT_LIST_HEAD(&root->leak_list); -@@ -1379,11 +1379,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) { -- ret = get_anon_bdev(&root->anon_dev); -+ ret = insert_anon_sbdev(root->fs_info->sb, -+ &root->sbdev); - if (ret) - goto fail; - } else { -- root->anon_dev = anon_dev; -+ insert_prealloc_anon_sbdev(root->fs_info->sb, -+ &root->sbdev, anon_dev); - } - } - -@@ -1981,8 +1983,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)); -- if (root->anon_dev) -- free_anon_bdev(root->anon_dev); -+ remove_anon_sbdev(&root->sbdev); - btrfs_drew_lock_destroy(&root->snapshot_lock); - free_root_extent_buffers(root); - kfree(root->free_ino_ctl); ---- a/fs/btrfs/inode.c -+++ b/fs/btrfs/inode.c -@@ -4028,8 +4028,7 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) - } - } - -- free_anon_bdev(dest->anon_dev); -- dest->anon_dev = 0; -+ remove_anon_sbdev(&dest->sbdev); - out_end_trans: - trans->block_rsv = NULL; - trans->bytes_reserved = 0; -@@ -8784,7 +8783,7 @@ static int btrfs_getattr(const struct path *path, struct kstat *stat, - STATX_ATTR_NODUMP); - - generic_fillattr(inode, stat); -- stat->dev = BTRFS_I(inode)->root->anon_dev; -+ stat->dev = BTRFS_I(inode)->root->sbdev.anon_dev; - - spin_lock(&BTRFS_I(inode)->lock); - delalloc_bytes = BTRFS_I(inode)->new_delalloc_bytes; ---- a/fs/btrfs/ioctl.c -+++ b/fs/btrfs/ioctl.c -@@ -866,8 +866,11 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, - pending_snapshot->anon_dev = 0; - fail: - /* Prevent double freeing of anon_dev */ -- if (ret && pending_snapshot->snap) -- pending_snapshot->snap->anon_dev = 0; -+ if (ret && pending_snapshot->snap && -+ pending_snapshot->snap->sbdev.anon_dev) { -+ remove_anon_sbdev(&pending_snapshot->snap->sbdev); -+ pending_snapshot->anon_dev = 0; -+ } - btrfs_put_root(pending_snapshot->snap); - btrfs_subvolume_release_metadata(root, &pending_snapshot->block_rsv); - free_pending: ---- a/fs/btrfs/super.c -+++ b/fs/btrfs/super.c -@@ -2407,7 +2407,7 @@ static int btrfs_show_devname(struct seq_file *m, struct dentry *root) - - static dev_t btrfs_get_inode_dev(const struct inode *inode) - { -- return BTRFS_I(inode)->root->anon_dev; -+ return BTRFS_I(inode)->root->sbdev.anon_dev; - } - - static const struct super_operations btrfs_super_ops = { ---- a/fs/super.c -+++ b/fs/super.c -@@ -190,6 +190,20 @@ int insert_anon_sbdev(struct super_block *sb, struct super_block_dev *sbdev) - } - EXPORT_SYMBOL_GPL(insert_anon_sbdev); - -+/* To be used only by btrfs */ -+void insert_prealloc_anon_sbdev(struct super_block *sb, -+ struct super_block_dev *sbdev, dev_t preallocated) -+{ -+ sbdev->anon_dev = preallocated; -+ -+ sbdev->sb = sb; -+ -+ spin_lock(&sb_lock); -+ list_add_tail(&sbdev->entry, &sb->s_sbdevs); -+ spin_unlock(&sb_lock); -+} -+EXPORT_SYMBOL_GPL(insert_prealloc_anon_sbdev); -+ - /* To be used only by btrfs */ - void remove_anon_sbdev(struct super_block_dev *sbdev) - { -@@ -202,8 +216,10 @@ void remove_anon_sbdev(struct super_block_dev *sbdev) - } - spin_unlock(&sb_lock); - -- if (remove) -+ if (remove) { - free_anon_bdev(sbdev->anon_dev); -+ sbdev->anon_dev = 0; -+ } - } - EXPORT_SYMBOL_GPL(remove_anon_sbdev); - ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2264,6 +2264,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); -+void insert_prealloc_anon_sbdev(struct super_block *sb, -+ struct super_block_dev *sbdev, dev_t preallocated); - void remove_anon_sbdev(struct super_block_dev *sbdev); - static inline void init_anon_sbdev(struct super_block_dev *sbdev) - { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-fix-crash-after-non-aligned-direct-IO-write-wi.patch new/patches.suse/btrfs-fix-crash-after-non-aligned-direct-IO-write-wi.patch --- old/patches.suse/btrfs-fix-crash-after-non-aligned-direct-IO-write-wi.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/btrfs-fix-crash-after-non-aligned-direct-IO-write-wi.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -From 94663c8a2172dc96b760d356a538d45c36f46040 Mon Sep 17 00:00:00 2001 -Message-Id: <94663c8a2172dc96b760d356a538d45c36f46040.1613062764.git.fdman...@suse.com> -From: Filipe Manana <[email protected]> -Date: Thu, 11 Feb 2021 16:29:32 +0000 -References: bsc#1181605 -Patch-mainline: submitted, https://patchwork.kernel.org/project/linux-btrfs/patch/94663c8a2172dc96b760d356a538d45c36f46040.1613062764.git.fdman...@suse.com/ -Subject: [PATCH] btrfs: fix crash after non-aligned direct IO write with - O_DSYNC - -Whenever we attempt to do a non-aligned direct IO write with O_DSYNC, we -end up triggering an assertion and crashing. Example reproducer: - - $ cat test.sh - #!/bin/bash - - DEV=/dev/sdj - MNT=/mnt/sdj - - mkfs.btrfs -f $DEV > /dev/null - mount $DEV $MNT - - # Do a direct IO write with O_DSYNC into a non-aligned range... - xfs_io -f -d -s -c "pwrite -S 0xab -b 64K 1111 64K" $MNT/foobar - - umount $MNT - -When running the reproducer an assertion fails and produces the following -trace: - - [ 2418.403134] assertion failed: !current->journal_info || flush != BTRFS_RESERVE_FLUSH_DATA, in fs/btrfs/space-info.c:1467 - [ 2418.403745] ------------[ cut here ]------------ - [ 2418.404306] kernel BUG at fs/btrfs/ctree.h:3286! - [ 2418.404862] invalid opcode: 0000 [#2] PREEMPT SMP DEBUG_PAGEALLOC PTI - [ 2418.405451] CPU: 1 PID: 64705 Comm: xfs_io Tainted: G D 5.10.15-btrfs-next-87 #1 - [ 2418.406026] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 - [ 2418.407228] RIP: 0010:assertfail.constprop.0+0x18/0x26 [btrfs] - [ 2418.407835] Code: e6 48 c7 (...) - [ 2418.409078] RSP: 0018:ffffb06080d13c98 EFLAGS: 00010246 - [ 2418.409696] RAX: 000000000000006c RBX: ffff994c1debbf08 RCX: 0000000000000000 - [ 2418.410302] RDX: 0000000000000000 RSI: 0000000000000027 RDI: 00000000ffffffff - [ 2418.410904] RBP: ffff994c21770000 R08: 0000000000000000 R09: 0000000000000000 - [ 2418.411504] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000010000 - [ 2418.412111] R13: ffff994c22198400 R14: ffff994c21770000 R15: 0000000000000000 - [ 2418.412713] FS: 00007f54fd7aff00(0000) GS:ffff994d35200000(0000) knlGS:0000000000000000 - [ 2418.413326] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 - [ 2418.413933] CR2: 000056549596d000 CR3: 000000010b928003 CR4: 0000000000370ee0 - [ 2418.414528] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 - [ 2418.415109] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 - [ 2418.415669] Call Trace: - [ 2418.416254] btrfs_reserve_data_bytes.cold+0x22/0x22 [btrfs] - [ 2418.416812] btrfs_check_data_free_space+0x4c/0xa0 [btrfs] - [ 2418.417380] btrfs_buffered_write+0x1b0/0x7f0 [btrfs] - [ 2418.418315] btrfs_file_write_iter+0x2a9/0x770 [btrfs] - [ 2418.418920] new_sync_write+0x11f/0x1c0 - [ 2418.419430] vfs_write+0x2bb/0x3b0 - [ 2418.419972] __x64_sys_pwrite64+0x90/0xc0 - [ 2418.420486] do_syscall_64+0x33/0x80 - [ 2418.420979] entry_SYSCALL_64_after_hwframe+0x44/0xa9 - [ 2418.421486] RIP: 0033:0x7f54fda0b986 - [ 2418.421981] Code: 48 c7 c0 (...) - [ 2418.423019] RSP: 002b:00007ffc40569c38 EFLAGS: 00000246 ORIG_RAX: 0000000000000012 - [ 2418.423547] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f54fda0b986 - [ 2418.424075] RDX: 0000000000010000 RSI: 000056549595e000 RDI: 0000000000000003 - [ 2418.424596] RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000400 - [ 2418.425119] R10: 0000000000000400 R11: 0000000000000246 R12: 00000000ffffffff - [ 2418.425644] R13: 0000000000000400 R14: 0000000000010000 R15: 0000000000000000 - [ 2418.426148] Modules linked in: btrfs blake2b_generic (...) - [ 2418.429540] ---[ end trace ef2aeb44dc0afa34 ]--- - -1) At btrfs_file_write_iter() we set current->journal_info to - BTRFS_DIO_SYNC_STUB; - -2) We then call __btrfs_direct_write(), which calls btrfs_direct_IO(); - -3) We can't do the direct IO write because it starts at a non-aligned - offset (1111). So at btrfs_direct_IO() we return -EINVAL (coming from - check_direct_IO() which does the alignment check), but we leave - current->journal_info set to BTRFS_DIO_SYNC_STUB - we only clear it - at btrfs_dio_iomap_begin(), because we assume we always get there; - -4) Then at __btrfs_direct_write() we see that the attempt to do the - direct IO write was not successful, 0 bytes written, so we fallback - to a buffered write by calling btrfs_buffered_write(); - -5) There we call btrfs_check_data_free_space() which in turn calls - btrfs_alloc_data_chunk_ondemand() and that calls - btrfs_reserve_data_bytes() with flush == BTRFS_RESERVE_FLUSH_DATA; - -6) Then at btrfs_reserve_data_bytes() we have current->journal_info set to - BTRFS_DIO_SYNC_STUB, therefore not NULL, and flush has the value - BTRFS_RESERVE_FLUSH_DATA, triggering the second assertion: - - int btrfs_reserve_data_bytes(struct btrfs_fs_info *fs_info, u64 bytes, - enum btrfs_reserve_flush_enum flush) - { - struct btrfs_space_info *data_sinfo = fs_info->data_sinfo; - int ret; - - ASSERT(flush == BTRFS_RESERVE_FLUSH_DATA || - flush == BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE); - ASSERT(!current->journal_info || flush != BTRFS_RESERVE_FLUSH_DATA); - (...) - -So fix that by setting the journal to NULL whenever check_direct_IO() -returns a failure. - -This bug only affects 5.10 kernels, and the regression was introduced in -5.10-rc1 by commit 0eb79294dbe328 ("btrfs: dio iomap DSYNC workaround"). -The bug does not exist in 5.11 kernels due to commit ecfdc08b8cc65d -("btrfs: remove dio iomap DSYNC workaround"), which depends on other -changes that went into the merge window for 5.11. So this is a fix only -for 5.10.x stable kernels, as there are people hitting this. - -Fixes: 0eb79294dbe328 ("btrfs: dio iomap DSYNC workaround") -CC: [email protected] # 5.10 (and only 5.10) -Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1181605 -Signed-off-by: Filipe Manana <[email protected]> ---- - fs/btrfs/inode.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c -index acc47e2ffb46..b536d21541a9 100644 ---- a/fs/btrfs/inode.c -+++ b/fs/btrfs/inode.c -@@ -8026,8 +8026,12 @@ ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) - bool relock = false; - ssize_t ret; - -- if (check_direct_IO(fs_info, iter, offset)) -+ if (check_direct_IO(fs_info, iter, offset)) { -+ ASSERT(current->journal_info == NULL || -+ current->journal_info == BTRFS_DIO_SYNC_STUB); -+ current->journal_info = NULL; - return 0; -+ } - - count = iov_iter_count(iter); - if (iov_iter_rw(iter) == WRITE) { --- -2.28.0 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch new/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch --- old/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch 2021-02-24 00:11:36.000000000 +0100 @@ -102,7 +102,7 @@ s->s_count = 1; atomic_set(&s->s_active, 1); -@@ -876,7 +931,7 @@ struct super_block *user_get_super(dev_t dev) +@@ -817,7 +872,7 @@ struct super_block *user_get_super(dev_t dev, bool excl) list_for_each_entry(sb, &super_blocks, s_list) { if (hlist_unhashed(&sb->s_instances)) continue; @@ -110,10 +110,10 @@ + if (super_dev_match(sb, dev)) { sb->s_count++; spin_unlock(&sb_lock); - down_read(&sb->s_umount); + if (excl) --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1413,6 +1413,14 @@ struct sb_writers { +@@ -1411,6 +1411,14 @@ struct sb_writers { struct percpu_rw_semaphore rw_sem[SB_FREEZE_LEVELS]; }; @@ -128,7 +128,7 @@ struct super_block { struct list_head s_list; /* Keep this first */ dev_t s_dev; /* search index; _not_ kdev_t */ -@@ -1447,6 +1455,7 @@ struct super_block { +@@ -1445,6 +1453,7 @@ struct super_block { __u16 s_encoding_flags; #endif struct hlist_bl_head s_roots; /* alternate root dentries for NFS */ @@ -136,7 +136,7 @@ struct list_head s_mounts; /* list of mounts; _not_ for fs use */ struct block_device *s_bdev; struct backing_dev_info *s_bdi; -@@ -2263,6 +2272,17 @@ int set_anon_super(struct super_block *s, void *data); +@@ -2275,6 +2284,17 @@ int set_anon_super(struct super_block *s, void *data); int set_anon_super_fc(struct super_block *s, struct fs_context *fc); int get_anon_bdev(dev_t *); void free_anon_bdev(dev_t); 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 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/btrfs-use-the-new-VFS-super_block_dev.patch 2021-02-24 00:11:36.000000000 +0100 @@ -0,0 +1,172 @@ +From: "Luis R. Rodriguez" <[email protected]> +Date: Wed, 13 Aug 2014 16:05:22 -0400 +Subject: btrfs: use the new VFS super_block_dev +Patch-mainline: Never, submitted but not accepted +References: bsc#865869 + +Use the new VFS layer struct super_block_dev instead of carrying +the anonymous bdev's on our own. This makes the VFS layer aware of +all of our anonymous dev's on the super block. + +Signed-off-by: Luis R. Rodriguez <[email protected]> +Signed-off-by: Filipe Manana <[email protected]> +fdmanana: fix for running qgroup sanity tests +--- + fs/btrfs/ctree.h | 7 ++----- + fs/btrfs/disk-io.c | 11 ++++++----- + fs/btrfs/inode.c | 5 ++--- + fs/btrfs/ioctl.c | 7 +++++-- + fs/btrfs/super.c | 2 +- + fs/super.c | 18 +++++++++++++++++- + include/linux/fs.h | 2 ++ + 7 files changed, 35 insertions(+), 17 deletions(-) + +--- a/fs/btrfs/ctree.h ++++ b/fs/btrfs/ctree.h +@@ -1117,11 +1117,8 @@ struct btrfs_root { + * protected by inode_lock + */ + struct radix_tree_root delayed_nodes_tree; +- /* +- * right now this just gets used so that a root has its own devid +- * for stat. It may be used for more later +- */ +- dev_t anon_dev; ++ ++ struct super_block_dev sbdev; + + spinlock_t root_item_lock; + 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, + memset(&root->root_item, 0, sizeof(root->root_item)); + memset(&root->defrag_progress, 0, sizeof(root->defrag_progress)); + root->root_key.objectid = objectid; +- root->anon_dev = 0; + + spin_lock_init(&root->root_item_lock); ++ init_anon_sbdev(&root->sbdev); + 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) + if (is_fstree(root->root_key.objectid) && + btrfs_root_refs(&root->root_item) > 0) { + if (!anon_dev) { +- ret = get_anon_bdev(&root->anon_dev); ++ ret = insert_anon_sbdev(root->fs_info->sb, ++ &root->sbdev); + if (ret) + goto fail; + } else { +- root->anon_dev = anon_dev; ++ insert_prealloc_anon_sbdev(root->fs_info->sb, ++ &root->sbdev, anon_dev); + } + } + +@@ -2016,8 +2018,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)); +- if (root->anon_dev) +- free_anon_bdev(root->anon_dev); ++ remove_anon_sbdev(&root->sbdev); + btrfs_drew_lock_destroy(&root->snapshot_lock); + free_root_extent_buffers(root); + #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) + } + } + +- free_anon_bdev(dest->anon_dev); +- dest->anon_dev = 0; ++ remove_anon_sbdev(&dest->sbdev); + 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, + STATX_ATTR_NODUMP); + + generic_fillattr(inode, stat); +- stat->dev = BTRFS_I(inode)->root->anon_dev; ++ stat->dev = BTRFS_I(inode)->root->sbdev.anon_dev; + + spin_lock(&BTRFS_I(inode)->lock); + 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, + pending_snapshot->anon_dev = 0; + fail: + /* Prevent double freeing of anon_dev */ +- if (ret && pending_snapshot->snap) +- pending_snapshot->snap->anon_dev = 0; ++ if (ret && pending_snapshot->snap && ++ pending_snapshot->snap->sbdev.anon_dev) { ++ remove_anon_sbdev(&pending_snapshot->snap->sbdev); ++ pending_snapshot->anon_dev = 0; ++ } + btrfs_put_root(pending_snapshot->snap); + btrfs_subvolume_release_metadata(root, &pending_snapshot->block_rsv); + 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) + + static dev_t btrfs_get_inode_dev(const struct inode *inode) + { +- return BTRFS_I(inode)->root->anon_dev; ++ return BTRFS_I(inode)->root->sbdev.anon_dev; + } + + static const struct super_operations btrfs_super_ops = { +--- a/fs/super.c ++++ b/fs/super.c +@@ -190,6 +190,20 @@ int insert_anon_sbdev(struct super_block *sb, struct super_block_dev *sbdev) + } + EXPORT_SYMBOL_GPL(insert_anon_sbdev); + ++/* To be used only by btrfs */ ++void insert_prealloc_anon_sbdev(struct super_block *sb, ++ struct super_block_dev *sbdev, dev_t preallocated) ++{ ++ sbdev->anon_dev = preallocated; ++ ++ sbdev->sb = sb; ++ ++ spin_lock(&sb_lock); ++ list_add_tail(&sbdev->entry, &sb->s_sbdevs); ++ spin_unlock(&sb_lock); ++} ++EXPORT_SYMBOL_GPL(insert_prealloc_anon_sbdev); ++ + /* To be used only by btrfs */ + void remove_anon_sbdev(struct super_block_dev *sbdev) + { +@@ -202,8 +216,10 @@ void remove_anon_sbdev(struct super_block_dev *sbdev) + } + spin_unlock(&sb_lock); + +- if (remove) ++ if (remove) { + free_anon_bdev(sbdev->anon_dev); ++ sbdev->anon_dev = 0; ++ } + } + EXPORT_SYMBOL_GPL(remove_anon_sbdev); + +--- a/include/linux/fs.h ++++ b/include/linux/fs.h +@@ -2288,6 +2288,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); ++void insert_prealloc_anon_sbdev(struct super_block *sb, ++ struct super_block_dev *sbdev, dev_t preallocated); + void remove_anon_sbdev(struct super_block_dev *sbdev); + static inline void init_anon_sbdev(struct super_block_dev *sbdev) + { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/drm-bail-out-of-nouveau_channel_new-if-channel-init-.patch new/patches.suse/drm-bail-out-of-nouveau_channel_new-if-channel-init-.patch --- old/patches.suse/drm-bail-out-of-nouveau_channel_new-if-channel-init-.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/drm-bail-out-of-nouveau_channel_new-if-channel-init-.patch 2021-02-24 00:11:36.000000000 +0100 @@ -2,7 +2,8 @@ From: Frantisek Hrbata <[email protected]> Date: Fri, 28 Aug 2020 11:28:46 +0200 Subject: [PATCH] drm: bail out of nouveau_channel_new if channel init fails -Patch-mainline: Submitted, nouveau ML +Patch-mainline: v5.12-rc1 +Git-commit: eaba3b28401f50e22d64351caa8afe8d29509f27 References: CVE-2020-25639 bsc#1176846 Unprivileged user can crash kernel by using DRM_IOCTL_NOUVEAU_CHANNEL_ALLOC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/drm-docs-Fix-todo.rst.patch new/patches.suse/drm-docs-Fix-todo.rst.patch --- old/patches.suse/drm-docs-Fix-todo.rst.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/drm-docs-Fix-todo.rst.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -From: Daniel Vetter <[email protected]> -Date: Wed, 18 Nov 2020 08:36:37 +0100 -Subject: drm/docs: Fix todo.rst -Git-commit: fa388231fec99b60346319d56495ae531b666275 -Patch-mainline: 5.11-rc1 -References: git-fixes - -I didnt' format the thing correctly :-( - -Fixes: 39aead8373b3 ("fbcon: Disable accelerated scrolling") -Reviewed-by: Simon Ser <[email protected]> -Reported-by: Stephen Rothwell <[email protected]> -Cc: Stephen Rothwell <[email protected]> -Signed-off-by: Daniel Vetter <[email protected]> -Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] -Signed-off-by: Jiri Slaby <[email protected]> ---- - Documentation/gpu/todo.rst | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/Documentation/gpu/todo.rst -+++ b/Documentation/gpu/todo.rst -@@ -278,9 +278,12 @@ Garbage collect fbdev scrolling accelera - - Scroll acceleration is disabled in fbcon by hard-wiring p->scrollmode = - SCROLL_REDRAW. There's a ton of code this will allow us to remove: -+ - - lots of code in fbcon.c -+ - - a bunch of the hooks in fbcon_ops, maybe the remaining hooks could be called - directly instead of the function table (with a switch on p->rotate) -+ - - fb_copyarea is unused after this, and can be deleted from all drivers - - Note that not all acceleration code can be deleted, since clearing and cursor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/floppy-reintroduce-O_NDELAY-fix.patch new/patches.suse/floppy-reintroduce-O_NDELAY-fix.patch --- old/patches.suse/floppy-reintroduce-O_NDELAY-fix.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/floppy-reintroduce-O_NDELAY-fix.patch 2021-02-24 00:11:36.000000000 +0100 @@ -4,9 +4,8 @@ Subject: [PATCH] floppy: reintroduce O_NDELAY fix References: boo#1181018 -Patch-mainline: queued -Git-repo: https://github.com/evdenis/linux-floppy -Git-commit: e32f6163c47efbdbad06258560aa00d1c7e5b699 +Patch-mainline: v5.12-rc1 +Git-commit: 8a0c014cd20516ade9654fc13b51345ec58e7be8 This issue was originally fixed in 09954bad4 ("floppy: refactor open() flags handling"). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch new/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch --- old/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch 2021-02-24 00:11:36.000000000 +0100 @@ -46,7 +46,7 @@ --- a/Makefile +++ b/Makefile -@@ -1087,6 +1087,15 @@ PHONY += prepare0 +@@ -1106,6 +1106,15 @@ PHONY += prepare0 export MODORDER := $(extmod-prefix)modules.order export MODULES_NSDEPS := $(extmod-prefix)modules.nsdeps @@ -62,7 +62,7 @@ ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ -@@ -1186,7 +1195,7 @@ PHONY += prepare archprepare +@@ -1204,7 +1213,7 @@ PHONY += prepare archprepare archprepare: outputmakefile archheaders archscripts scripts include/config/kernel.release \ asm-generic $(version_h) $(autoksyms_h) include/generated/utsrelease.h \ @@ -156,15 +156,15 @@ +endmenu --- a/lib/dump_stack.c +++ b/lib/dump_stack.c -@@ -12,6 +12,7 @@ - #include <linux/atomic.h> +@@ -13,6 +13,7 @@ #include <linux/kexec.h> #include <linux/utsname.h> + #include <linux/stop_machine.h> +#include <linux/suse_version.h> static char dump_stack_arch_desc_str[128]; -@@ -44,13 +45,13 @@ void __init dump_stack_set_arch_desc(const char *fmt, ...) +@@ -45,13 +46,13 @@ void __init dump_stack_set_arch_desc(const char *fmt, ...) */ void dump_stack_print_info(const char *log_lvl) { @@ -274,7 +274,7 @@ /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; -@@ -2488,6 +2489,14 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -2497,6 +2498,14 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -289,7 +289,7 @@ static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2764,6 +2773,7 @@ int main(int argc, char **argv) +@@ -2773,6 +2782,7 @@ int main(int argc, char **argv) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/media-pwc-Use-correct-device-for-DMA.patch new/patches.suse/media-pwc-Use-correct-device-for-DMA.patch --- old/patches.suse/media-pwc-Use-correct-device-for-DMA.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/media-pwc-Use-correct-device-for-DMA.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,148 +0,0 @@ -From 69c9e825e812ec6d663e64ebf14bd3bc7f37e2c7 Mon Sep 17 00:00:00 2001 -From: "Matwey V. Kornilov" <[email protected]> -Date: Mon, 4 Jan 2021 18:00:07 +0100 -Subject: [PATCH] media: pwc: Use correct device for DMA -Git-commit: 69c9e825e812ec6d663e64ebf14bd3bc7f37e2c7 -Git-repo: git://linuxtv.org/mchehab/media-next.git -Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1181133 - -This fixes the following newly introduced warning: - -[ 15.518253] ------------[ cut here ]------------ -[ 15.518941] WARNING: CPU: 0 PID: 246 at kernel/dma/mapping.c:149 dma_map_page_attrs+0x1a8/0x1d0 -[ 15.520634] Modules linked in: pwc videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev mc efivarfs -[ 15.522335] CPU: 0 PID: 246 Comm: v4l2-test Not tainted 5.11.0-rc1+ #1 -[ 15.523281] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 -[ 15.524438] RIP: 0010:dma_map_page_attrs+0x1a8/0x1d0 -[ 15.525135] Code: 10 5b 5d 41 5c 41 5d c3 4d 89 d0 eb d7 4d 89 c8 89 e9 48 89 da e8 68 29 00 00 eb d1 48 89 f2 48 2b 50 18 48 89 d0 eb 83 0f 0b <0f> 0b 48 c7 c0 ff ff ff ff eb b8 48 89 d9 48 8b 40 40 e8 61 69 d2 -[ 15.527938] RSP: 0018:ffffa2694047bca8 EFLAGS: 00010246 -[ 15.528716] RAX: 0000000000000000 RBX: 0000000000002580 RCX: 0000000000000000 -[ 15.529782] RDX: 0000000000000000 RSI: ffffcdce000ecc00 RDI: ffffa0b4bdb888a0 -[ 15.530849] RBP: 0000000000000002 R08: 0000000000000002 R09: 0000000000000000 -[ 15.531881] R10: 0000000000000004 R11: 000000000002d8c0 R12: 0000000000000000 -[ 15.532911] R13: ffffa0b4bdb88800 R14: ffffa0b483820000 R15: ffffa0b4bdb888a0 -[ 15.533942] FS: 00007fc5fbb5e4c0(0000) GS:ffffa0b4fc000000(0000) knlGS:0000000000000000 -[ 15.535141] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 -[ 15.535988] CR2: 00007fc5fb6ea138 CR3: 0000000003812000 CR4: 00000000001506f0 -[ 15.537025] Call Trace: -[ 15.537425] start_streaming+0x2e9/0x4b0 [pwc] -[ 15.538143] vb2_start_streaming+0x5e/0x110 [videobuf2_common] -[ 15.538989] vb2_core_streamon+0x107/0x140 [videobuf2_common] -[ 15.539831] __video_do_ioctl+0x18f/0x4a0 [videodev] -[ 15.540670] video_usercopy+0x13a/0x5b0 [videodev] -[ 15.541349] ? video_put_user+0x230/0x230 [videodev] -[ 15.542096] ? selinux_file_ioctl+0x143/0x200 -[ 15.542752] v4l2_ioctl+0x40/0x50 [videodev] -[ 15.543360] __x64_sys_ioctl+0x89/0xc0 -[ 15.543930] do_syscall_64+0x33/0x40 -[ 15.544448] entry_SYSCALL_64_after_hwframe+0x44/0xa9 -[ 15.545236] RIP: 0033:0x7fc5fb671587 -[ 15.545780] Code: b3 66 90 48 8b 05 11 49 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d e1 48 2c 00 f7 d8 64 89 01 48 -[ 15.548486] RSP: 002b:00007fff0f71f038 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 -[ 15.549578] RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007fc5fb671587 -[ 15.550664] RDX: 00007fff0f71f060 RSI: 0000000040045612 RDI: 0000000000000003 -[ 15.551706] RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 -[ 15.552738] R10: 0000000000000000 R11: 0000000000000246 R12: 00007fff0f71f060 -[ 15.553817] R13: 00007fff0f71f1d0 R14: 0000000000de1270 R15: 0000000000000000 -[ 15.554914] ---[ end trace 7be03122966c2486 ]--- - -Fixes: 1161db6776bd ("media: usb: pwc: Don't use coherent DMA buffers for ISO transfer") -Signed-off-by: Matwey V. Kornilov <[email protected]> -Signed-off-by: Hans Verkuil <[email protected]> -Signed-off-by: Mauro Carvalho Chehab <[email protected]> -Acked-by: Takashi Iwai <[email protected]> - ---- - drivers/media/usb/pwc/pwc-if.c | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c -index 61869636ec61..5e3339cc31c0 100644 ---- a/drivers/media/usb/pwc/pwc-if.c -+++ b/drivers/media/usb/pwc/pwc-if.c -@@ -155,16 +155,17 @@ static const struct video_device pwc_template = { - /***************************************************************************/ - /* Private functions */ - --static void *pwc_alloc_urb_buffer(struct device *dev, -+static void *pwc_alloc_urb_buffer(struct usb_device *dev, - size_t size, dma_addr_t *dma_handle) - { -+ struct device *dmadev = dev->bus->sysdev; - void *buffer = kmalloc(size, GFP_KERNEL); - - if (!buffer) - return NULL; - -- *dma_handle = dma_map_single(dev, buffer, size, DMA_FROM_DEVICE); -- if (dma_mapping_error(dev, *dma_handle)) { -+ *dma_handle = dma_map_single(dmadev, buffer, size, DMA_FROM_DEVICE); -+ if (dma_mapping_error(dmadev, *dma_handle)) { - kfree(buffer); - return NULL; - } -@@ -172,12 +173,14 @@ static void *pwc_alloc_urb_buffer(struct device *dev, - return buffer; - } - --static void pwc_free_urb_buffer(struct device *dev, -+static void pwc_free_urb_buffer(struct usb_device *dev, - size_t size, - void *buffer, - dma_addr_t dma_handle) - { -- dma_unmap_single(dev, dma_handle, size, DMA_FROM_DEVICE); -+ struct device *dmadev = dev->bus->sysdev; -+ -+ dma_unmap_single(dmadev, dma_handle, size, DMA_FROM_DEVICE); - kfree(buffer); - } - -@@ -282,6 +285,7 @@ static void pwc_frame_complete(struct pwc_device *pdev) - static void pwc_isoc_handler(struct urb *urb) - { - struct pwc_device *pdev = (struct pwc_device *)urb->context; -+ struct device *dmadev = urb->dev->bus->sysdev; - int i, fst, flen; - unsigned char *iso_buf = NULL; - -@@ -328,7 +332,7 @@ static void pwc_isoc_handler(struct urb *urb) - /* Reset ISOC error counter. We did get here, after all. */ - pdev->visoc_errors = 0; - -- dma_sync_single_for_cpu(&urb->dev->dev, -+ dma_sync_single_for_cpu(dmadev, - urb->transfer_dma, - urb->transfer_buffer_length, - DMA_FROM_DEVICE); -@@ -379,7 +383,7 @@ static void pwc_isoc_handler(struct urb *urb) - pdev->vlast_packet_size = flen; - } - -- dma_sync_single_for_device(&urb->dev->dev, -+ dma_sync_single_for_device(dmadev, - urb->transfer_dma, - urb->transfer_buffer_length, - DMA_FROM_DEVICE); -@@ -461,7 +465,7 @@ static int pwc_isoc_init(struct pwc_device *pdev) - urb->pipe = usb_rcvisocpipe(udev, pdev->vendpoint); - urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; - urb->transfer_buffer_length = ISO_BUFFER_SIZE; -- urb->transfer_buffer = pwc_alloc_urb_buffer(&udev->dev, -+ urb->transfer_buffer = pwc_alloc_urb_buffer(udev, - urb->transfer_buffer_length, - &urb->transfer_dma); - if (urb->transfer_buffer == NULL) { -@@ -524,7 +528,7 @@ static void pwc_iso_free(struct pwc_device *pdev) - if (urb) { - PWC_DEBUG_MEMORY("Freeing URB\n"); - if (urb->transfer_buffer) -- pwc_free_urb_buffer(&urb->dev->dev, -+ pwc_free_urb_buffer(urb->dev, - urb->transfer_buffer_length, - urb->transfer_buffer, - urb->transfer_dma); --- -2.26.2 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/media-uvcvideo-Accept-invalid-bFormatIndex-and-bFram.patch new/patches.suse/media-uvcvideo-Accept-invalid-bFormatIndex-and-bFram.patch --- old/patches.suse/media-uvcvideo-Accept-invalid-bFormatIndex-and-bFram.patch 2021-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/media-uvcvideo-Accept-invalid-bFormatIndex-and-bFram.patch 2021-02-24 00:11:36.000000000 +0100 @@ -5,7 +5,8 @@ Mime-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 8bit -Patch-mainline: Submitted, linux-media ML +Patch-mainline: v5.12-rc1 +Git-commit: dc9455ffae02d7b7fb51ba1e007fffcb9dc5d890 References: bsc#1180117 The Renkforce RF AC4K 300 Action Cam 4K reports invalid bFormatIndex and 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-02-12 15:35:44.000000000 +0100 +++ new/patches.suse/supported-flag 2021-02-24 00:11:36.000000000 +0100 @@ -19,23 +19,23 @@ Signed-off-by: Andreas Gruenbacher <[email protected]> --- - Documentation/admin-guide/kernel-parameters.txt | 8 ++ - Documentation/admin-guide/sysctl/kernel.rst | 54 +++++++++------ - Makefile | 5 + - include/linux/kernel.h | 20 +++++ - include/linux/module.h | 3 - init/Kconfig.suse | 18 +++++ - kernel/ksysfs.c | 27 +++++++ - kernel/module.c | 84 ++++++++++++++++++++++++ - kernel/panic.c | 3 - kernel/sysctl.c | 9 ++ - scripts/Makefile.modpost | 6 + - scripts/mod/modpost.c | 80 ++++++++++++++++++++++ + .../admin-guide/kernel-parameters.txt | 8 ++ + Documentation/admin-guide/sysctl/kernel.rst | 54 +++++++----- + Makefile | 5 ++ + include/linux/kernel.h | 20 +++++ + include/linux/module.h | 3 + + init/Kconfig.suse | 18 ++++ + kernel/ksysfs.c | 27 ++++++ + kernel/module.c | 84 +++++++++++++++++++ + kernel/panic.c | 3 + + kernel/sysctl.c | 9 ++ + scripts/Makefile.modpost | 6 +- + scripts/mod/modpost.c | 80 +++++++++++++++++- 12 files changed, 295 insertions(+), 22 deletions(-) --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5519,6 +5519,14 @@ +@@ -5526,6 +5526,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -59,7 +59,7 @@ -====== ===== ============================================================== - 1 `(P)` proprietary module was loaded - 2 `(F)` module was force loaded -- 4 `(S)` SMP kernel oops on an officially SMP incapable processor +- 4 `(S)` kernel running on an out of specification system - 8 `(R)` module was force unloaded - 16 `(M)` processor reported a Machine Check Exception (MCE) - 32 `(B)` bad page referenced or some unexpected page flags @@ -79,7 +79,7 @@ +========== ===== ========================================================== + 1 `(P)` proprietary module was loaded + 2 `(F)` module was force loaded -+ 4 `(S)` SMP kernel oops on an officially SMP incapable processor ++ 4 `(S)` kernel running on an out of specification system + 8 `(R)` module was force unloaded + 16 `(M)` processor reported a Machine Check Exception (MCE) + 32 `(B)` bad page referenced or some unexpected page flags @@ -136,17 +136,17 @@ KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -536,6 +536,9 @@ extern int panic_on_warn; - extern unsigned long panic_on_taint; - extern bool panic_on_taint_nousertaint; +@@ -378,6 +378,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; +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED +extern int suse_unsupported; +#endif - extern int sysctl_panic_on_stackoverflow; extern bool crash_kexec_post_notifiers; -@@ -605,6 +608,23 @@ extern enum system_states { + +@@ -446,6 +449,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 -@@ -562,6 +562,9 @@ bool is_module_address(unsigned long add +@@ -566,6 +566,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); @@ -207,7 +207,7 @@ + --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c -@@ -208,6 +208,30 @@ static struct bin_attribute notes_attr _ +@@ -208,6 +208,30 @@ static struct bin_attribute notes_attr __ro_after_init = { struct kobject *kernel_kobj; EXPORT_SYMBOL_GPL(kernel_kobj); @@ -238,19 +238,19 @@ static struct attribute * kernel_attrs[] = { &fscaps_attr.attr, &uevent_seqnum_attr.attr, -@@ -229,6 +253,9 @@ static struct attribute * kernel_attrs[] +@@ -228,6 +252,9 @@ static struct attribute * kernel_attrs[] = { + #ifndef CONFIG_TINY_RCU &rcu_expedited_attr.attr, &rcu_normal_attr.attr, - #endif ++#endif +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED + &supported_attr.attr, -+#endif + #endif NULL }; - --- a/kernel/module.c +++ b/kernel/module.c -@@ -81,6 +81,22 @@ +@@ -80,6 +80,22 @@ /* If this is set, the section belongs in the init part of the module */ #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) @@ -273,7 +273,7 @@ /* * Mutex protects: * 1) List of modules (also safely readable with preempt_disable), -@@ -1194,6 +1210,12 @@ static size_t module_flags_taint(struct +@@ -1223,6 +1239,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; } -@@ -1265,6 +1287,33 @@ static ssize_t show_taint(struct module_ +@@ -1294,6 +1316,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, -@@ -1273,6 +1322,9 @@ static struct module_attribute *modinfo_ +@@ -1302,6 +1351,9 @@ static struct module_attribute *modinfo_attrs[] = { &modinfo_coresize, &modinfo_initsize, &modinfo_taint, @@ -330,7 +330,7 @@ #ifdef CONFIG_MODULE_UNLOAD &modinfo_refcnt, #endif -@@ -1931,8 +1983,37 @@ static int mod_sysfs_setup(struct module +@@ -1962,8 +2014,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: -@@ -4590,6 +4671,9 @@ void print_modules(void) +@@ -4656,6 +4737,9 @@ void print_modules(void) if (last_unloaded_module[0]) pr_cont(" [last unloaded: %s]", last_unloaded_module); pr_cont("\n"); @@ -380,7 +380,7 @@ #ifdef CONFIG_MODVERSIONS --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -386,6 +386,9 @@ const struct taint_flag taint_flags[TAIN +@@ -386,6 +386,9 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_LIVEPATCH ] = { 'K', ' ', true }, [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, @@ -433,7 +433,7 @@ #include "../../include/linux/license.h" /* Are we using CONFIG_MODVERSIONS? */ -@@ -1988,6 +1989,50 @@ static char *remove_dot(char *s) +@@ -1992,6 +1993,50 @@ static char *remove_dot(char *s) return s; } @@ -484,7 +484,7 @@ static void read_symbols(const char *modname) { const char *symname; -@@ -2286,6 +2331,15 @@ static void add_staging_flag(struct buff +@@ -2278,6 +2323,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 **/ -@@ -2428,6 +2482,15 @@ static void write_if_changed(struct buff +@@ -2416,6 +2470,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 **/ -@@ -2553,13 +2616,16 @@ int main(int argc, char **argv) +@@ -2541,12 +2604,15 @@ int main(int argc, char **argv) struct buffer buf = { }; char *missing_namespace_deps = NULL; char *dump_write = NULL, *files_source = NULL; @@ -524,7 +524,6 @@ + const char *supported = NULL; +#endif int opt; - int err; int n; struct dump_list *dump_read_start = NULL; struct dump_list **dump_read_iter = &dump_read_start; @@ -534,7 +533,7 @@ switch (opt) { case 'e': external_module = 1; -@@ -2597,11 +2663,20 @@ int main(int argc, char **argv) +@@ -2584,11 +2650,20 @@ int main(int argc, char **argv) case 'd': missing_namespace_deps = optarg; break; @@ -555,13 +554,13 @@ while (dump_read_start) { struct dump_list *tmp; -@@ -2641,6 +2716,9 @@ int main(int argc, char **argv) +@@ -2626,6 +2701,9 @@ int main(int argc, char **argv) add_intree_flag(&buf, !external_module); add_retpoline(&buf); add_staging_flag(&buf, mod->name); +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED + add_supported_flag(&buf, mod); +#endif - err |= add_versions(&buf, mod); + add_versions(&buf, mod); add_depends(&buf, mod); add_moddevtable(&buf, mod); ++++++ post.sh ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:34.643321206 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:34.647321207 +0100 @@ -1,5 +1,6 @@ # Flag to trigger /etc/init.d/purge-kernels on next reboot (fate#312018) -touch /boot/do_purge_kernels +# ... but avoid the first installion (bsc#1180058) +test $1 -gt 1 && touch /boot/do_purge_kernels suffix= if test "@FLAVOR@" = "vanilla"; then ++++++ series.conf ++++++ ++++ 2048 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.2378/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:34.747321250 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:34.747321250 +0100 @@ -1,3 +1,3 @@ -2021-02-13 16:20:19 +0000 -GIT Revision: 11381f36fbc45631c56f8d0c85c2ccf2cd57ec01 +2021-02-26 10:11:13 +0000 +GIT Revision: ee0b277e036ac6832c4219283961bc990f56901d GIT Branch: stable ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.gY9a6d/_old 2021-03-03 18:33:34.787321268 +0100 +++ /var/tmp/diff_new_pack.gY9a6d/_new 2021-03-03 18:33:34.787321268 +0100 @@ -3221,6 +3221,7 @@ - drivers/usb/gadget/udc/bdc/bdc - drivers/usb/gadget/udc/bdc/bdc_pci - drivers/usb/gadget/udc/fsl_usb2_udc +- drivers/usb/gadget/udc/pch_udc - drivers/usb/gadget/udc/snps_udc_core - drivers/usb/gadget/udc/snps_udc_plat drivers/usb/gadget/udc/udc-core
