Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2019-09-02 13:18:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Mon Sep 2 13:18:07 2019 rev:503 rq:727147 version:5.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-64kb.changes 2019-08-27 10:11:07.939980544 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.7948/kernel-64kb.changes 2019-09-02 13:18:18.237385141 +0200 @@ -1,0 +2,331 @@ +Thu Aug 29 08:41:19 CEST 2019 - jslaby@suse.cz + +- Linux 5.2.11 (bnc#1012628). +- ASoC: simple_card_utils.h: care NULL dai at + asoc_simple_debug_dai() (bnc#1012628). +- ASoC: simple-card: fix an use-after-free in + simple_dai_link_of_dpcm() (bnc#1012628). +- ASoC: simple-card: fix an use-after-free in + simple_for_each_link() (bnc#1012628). +- ASoC: audio-graph-card: fix use-after-free in + graph_dai_link_of_dpcm() (bnc#1012628). +- ASoC: audio-graph-card: fix an use-after-free in + graph_get_dai_id() (bnc#1012628). +- ASoC: audio-graph-card: add missing const at graph_get_dai_id() + (bnc#1012628). +- regulator: axp20x: fix DCDCA and DCDCD for AXP806 (bnc#1012628). +- regulator: axp20x: fix DCDC5 and DCDC6 for AXP803 (bnc#1012628). +- ASoC: samsung: odroid: fix an use-after-free issue for codec + (bnc#1012628). +- ASoC: samsung: odroid: fix a double-free issue for cpu_dai + (bnc#1012628). +- ASoC: Intel: bytcht_es8316: Add quirk for Irbis NB41 netbook + (bnc#1012628). +- HID: logitech-hidpp: add USB PID for a few more supported mice + (bnc#1012628). +- HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT (bnc#1012628). +- MIPS: kernel: only use i8253 clocksource with periodic + clockevent (bnc#1012628). +- mips: fix cacheinfo (bnc#1012628). +- libbpf: sanitize VAR to conservative 1-byte INT (bnc#1012628). +- netfilter: ebtables: fix a memory leak bug in compat + (bnc#1012628). +- ASoC: dapm: Fix handling of custom_stop_condition on DAPM + graph walks (bnc#1012628). +- ASoC: SOF: use __u32 instead of uint32_t in uapi headers + (bnc#1012628). +- spi: pxa2xx: Balance runtime PM enable/disable on error + (bnc#1012628). +- bpf: sockmap, sock_map_delete needs to use xchg (bnc#1012628). +- bpf: sockmap, synchronize_rcu before free'ing map (bnc#1012628). +- bpf: sockmap, only create entry if ulp is not already enabled + (bnc#1012628). +- selftests/bpf: fix sendmsg6_prog on s390 (bnc#1012628). +- ASoC: dapm: fix a memory leak bug (bnc#1012628). +- bonding: Force slave speed check after link state recovery + for 802.3ad (bnc#1012628). +- net: mvpp2: Don't check for 3 consecutive Idle frames for 10G + links (bnc#1012628). +- selftests: forwarding: gre_multipath: Enable IPv4 forwarding + (bnc#1012628). +- selftests: forwarding: gre_multipath: Fix flower filters + (bnc#1012628). +- selftests/bpf: add another gso_segs access (bnc#1012628). +- libbpf: fix using uninitialized ioctl results (bnc#1012628). +- can: dev: call netif_carrier_off() in register_candev() + (bnc#1012628). +- can: mcp251x: add error check when wq alloc failed + (bnc#1012628). +- can: gw: Fix error path of cgw_module_init (bnc#1012628). +- ASoC: Fail card instantiation if DAI format setup fails + (bnc#1012628). +- Staging: fbtft: Fix GPIO handling (bnc#1012628). +- libbpf: silence GCC8 warning about string truncation + (bnc#1012628). +- st21nfca_connectivity_event_received: null check the allocation + (bnc#1012628). +- st_nci_hci_connectivity_event_received: null check the + allocation (bnc#1012628). +- {nl,mac}80211: fix interface combinations on crypto controlled + devices (bnc#1012628). +- ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master + mode (bnc#1012628). +- ASoC: rockchip: Fix mono capture (bnc#1012628). +- ASoC: ti: davinci-mcasp: Correct slot_width posed constraint + (bnc#1012628). +- net: usb: qmi_wwan: Add the BroadMobi BM818 card (bnc#1012628). +- qed: RDMA - Fix the hw_ver returned in device attributes + (bnc#1012628). +- isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences + in start_isoc_chain() (bnc#1012628). +- habanalabs: fix F/W download in BE architecture (bnc#1012628). +- mac80211_hwsim: Fix possible null-pointer dereferences in + hwsim_dump_radio_nl() (bnc#1012628). +- net: stmmac: manage errors returned by of_get_mac_address() + (bnc#1012628). +- netfilter: ipset: Actually allow destination MAC address for + hash:ip,mac sets too (bnc#1012628). +- netfilter: ipset: Copy the right MAC address in bitmap:ip,mac + and hash:ip,mac sets (bnc#1012628). +- netfilter: ipset: Fix rename concurrency with listing + (bnc#1012628). +- rxrpc: Fix potential deadlock (bnc#1012628). +- rxrpc: Fix the lack of notification when sendmsg() fails on + a DATA packet (bnc#1012628). +- nvmem: Use the same permissions for eeprom as for nvmem + (bnc#1012628). +- iwlwifi: mvm: avoid races in rate init and rate perform + (bnc#1012628). +- iwlwifi: dbg_ini: move iwl_dbg_tlv_load_bin out of debug + override ifdef (bnc#1012628). +- iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef + (bnc#1012628). +- iwlwifi: fix locking in delayed GTK setting (bnc#1012628). +- iwlwifi: mvm: send LQ command always ASYNC (bnc#1012628). +- enetc: Fix build error without PHYLIB (bnc#1012628). +- isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer + on the stack (bnc#1012628). +- net: phy: phy_led_triggers: Fix a possible null-pointer + dereference in phy_led_trigger_change_speed() (bnc#1012628). +- perf bench numa: Fix cpu0 binding (bnc#1012628). +- spi: pxa2xx: Add support for Intel Tiger Lake (bnc#1012628). +- can: sja1000: force the string buffer NULL-terminated + (bnc#1012628). +- can: peak_usb: force the string buffer NULL-terminated + (bnc#1012628). +- ASoC: amd: acp3x: use dma_ops of parent device for acp3x dma + driver (bnc#1012628). +- net/ethernet/qlogic/qed: force the string buffer NULL-terminated + (bnc#1012628). +- enetc: Select PHYLIB while CONFIG_FSL_ENETC_VF is set + (bnc#1012628). +- NFSv4: Fix a credential refcount leak in + nfs41_check_delegation_stateid (bnc#1012628). +- NFSv4: When recovering state fails with EAGAIN, retry the same + recovery (bnc#1012628). +- NFSv4.1: Fix open stateid recovery (bnc#1012628). +- NFSv4.1: Only reap expired delegations (bnc#1012628). +- NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim() + (bnc#1012628). +- NFS: Fix regression whereby fscache errors are appearing on + 'nofsc' mounts (bnc#1012628). +- HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on + Saitek X52 (bnc#1012628). +- HID: input: fix a4tech horizontal wheel custom usage + (bnc#1012628). +- drm/rockchip: Suspend DP late (bnc#1012628). +- SMB3: Fix potential memory leak when processing compound chain + (bnc#1012628). +- SMB3: Kernel oops mounting a encryptData share with + CONFIG_DEBUG_VIRTUAL (bnc#1012628). +- sched/deadline: Fix double accounting of rq/running bw in push & + pull (bnc#1012628). +- sched/psi: Reduce psimon FIFO priority (bnc#1012628). +- sched/psi: Do not require setsched permission from the trigger + creator (bnc#1012628). +- s390/protvirt: avoid memory sharing for diag 308 set/store + (bnc#1012628). +- s390/mm: fix dump_pagetables top level page table walking + (bnc#1012628). +- s390: put _stext and _etext into .text section (bnc#1012628). +- ata: rb532_cf: Fix unused variable warning in + rb532_pata_driver_probe (bnc#1012628). +- net: cxgb3_main: Fix a resource leak in a error path in + 'init_one()' (bnc#1012628). +- net: stmmac: Fix issues when number of Queues >= 4 + (bnc#1012628). +- net: stmmac: tc: Do not return a fragment entry (bnc#1012628). +- drm/amdgpu: pin the csb buffer on hw init for gfx v8 + (bnc#1012628). +- net: hisilicon: make hip04_tx_reclaim non-reentrant + (bnc#1012628). +- net: hisilicon: fix hip04-xmit never return TX_BUSY + (bnc#1012628). +- net: hisilicon: Fix dma_map_single failed on arm64 + (bnc#1012628). +- NFSv4: Ensure state recovery handles ETIMEDOUT correctly + (bnc#1012628). +- libata: have ata_scsi_rw_xlat() fail invalid passthrough + requests (bnc#1012628). +- libata: add SG safety checks in SFF pio transfers (bnc#1012628). +- x86/lib/cpu: Address missing prototypes warning (bnc#1012628). +- drm/vmwgfx: fix memory leak when too many retries have occurred + (bnc#1012628). +- block: aoe: Fix kernel crash due to atomic sleep when exiting + (bnc#1012628). +- block, bfq: handle NULL return value by bfq_init_rq() + (bnc#1012628). +- perf ftrace: Fix failure to set cpumask when only one cpu is + present (bnc#1012628). +- perf cpumap: Fix writing to illegal memory in handling cpumap + mask (bnc#1012628). +- perf pmu-events: Fix missing "cpu_clk_unhalted.core" event + (bnc#1012628). +- dt-bindings: riscv: fix the schema compatible string for the + HiFive Unleashed board (bnc#1012628). +- KVM: arm64: Don't write junk to sysregs on reset (bnc#1012628). +- KVM: arm: Don't write junk to CP15 registers on reset + (bnc#1012628). +- selftests: kvm: Adding config fragments (bnc#1012628). +- iwlwifi: mvm: disable TX-AMSDU on older NICs (bnc#1012628). +- HID: wacom: correct misreported EKR ring values (bnc#1012628). +- HID: wacom: Correct distance scale for 2nd-gen Intuos devices + (bnc#1012628). +- Revert "KVM: x86/mmu: Zap only the relevant pages when removing + a memslot" (bnc#1012628). +- Revert "dm bufio: fix deadlock with loop device" (bnc#1012628). +- clk: socfpga: stratix10: fix rate caclulationg for cnt_clks ++++ 211 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-64kb.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.7948/kernel-64kb.changes 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: ---- dtb-aarch64.changes dtb-aarch64.spec dtb-armv6l.changes dtb-armv6l.spec dtb-armv7l.changes dtb-armv7l.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.581383396 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.585383395 +0200 @@ -18,10 +18,11 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %define vanilla_only 0 %define compress_modules none +%define livepatch %{nil} %include %_sourcedir/kernel-spec-macros @@ -63,9 +64,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 5.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -170,10 +171,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71 -Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0 +Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0 # END COMMON DEPS -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1202,42 +1203,46 @@ /usr/src/linux-obj/%kmp_target_cpu %endif -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" -%package livepatch -Summary: Metapackage to pull in matching kernel-livepatch package +%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" +%if %livepatch == kgraft +%define patch_package %{livepatch}-patch +%else +%define patch_package kernel-%{livepatch} +%endif +%package %{livepatch} +Summary: Metapackage to pull in matching %patch_package package Group: System/Kernel -Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor +Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor} Provides: kernel-default-kgraft = %version Provides: kernel-xen-kgraft = %version Provides: multiversion(kernel) Obsoletes: kernel-default-kgraft < %version Obsoletes: kernel-xen-kgraft < %version -%description livepatch -This is a metapackage that pulls in the matching kernel-livepatch package for a +%description %{livepatch} +This is a metapackage that pulls in the matching %patch_package package for a given kernel version. The advantage of the metapackage is that its name is -static, unlike the kernel-livepatch-<kernel-version>-flavor package names. +static, unlike the %{patch_package}-<kernel-version>-flavor package names. -%files livepatch +%files %{livepatch} # rpmlint complains about empty packages, so lets own something %defattr(-, root, root) %dir /lib/modules/%kernelrelease-%build_flavor %endif -%if 0%{?klp_symbols} - -%package livepatch-devel -Summary: Kernel symbols file used during livepatch development +%if 0%{?klp_symbols} && "%livepatch" != "" +%package %{livepatch}-devel +Summary: Kernel symbols file used during kGraft patch development Group: System/Kernel Provides: klp-symbols = %version -%description livepatch-devel +%description %{livepatch}-devel This package brings a file named Symbols.list, which contains a list of all kernel symbols and its respective kernel object . This list is to be used by the klp-convert tool, which helps livepatch developers by enabling automatic symbol resolution. -%files livepatch-devel +%files %{livepatch}-devel %defattr(-, root, root) %dir %obj_install_dir %dir %obj_install_dir/%cpu_arch ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.597383394 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.601383393 +0200 @@ -18,10 +18,11 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %define vanilla_only 0 %define compress_modules none +%define livepatch %{nil} %include %_sourcedir/kernel-spec-macros @@ -63,9 +64,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -170,10 +171,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71 -Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0 +Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0 # END COMMON DEPS -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -1214,42 +1215,46 @@ /usr/src/linux-obj/%kmp_target_cpu %endif -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" -%package livepatch -Summary: Metapackage to pull in matching kernel-livepatch package +%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" +%if %livepatch == kgraft +%define patch_package %{livepatch}-patch +%else +%define patch_package kernel-%{livepatch} +%endif +%package %{livepatch} +Summary: Metapackage to pull in matching %patch_package package Group: System/Kernel -Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor +Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor} Provides: kernel-default-kgraft = %version Provides: kernel-xen-kgraft = %version Provides: multiversion(kernel) Obsoletes: kernel-default-kgraft < %version Obsoletes: kernel-xen-kgraft < %version -%description livepatch -This is a metapackage that pulls in the matching kernel-livepatch package for a +%description %{livepatch} +This is a metapackage that pulls in the matching %patch_package package for a given kernel version. The advantage of the metapackage is that its name is -static, unlike the kernel-livepatch-<kernel-version>-flavor package names. +static, unlike the %{patch_package}-<kernel-version>-flavor package names. -%files livepatch +%files %{livepatch} # rpmlint complains about empty packages, so lets own something %defattr(-, root, root) %dir /lib/modules/%kernelrelease-%build_flavor %endif -%if 0%{?klp_symbols} - -%package livepatch-devel -Summary: Kernel symbols file used during livepatch development +%if 0%{?klp_symbols} && "%livepatch" != "" +%package %{livepatch}-devel +Summary: Kernel symbols file used during kGraft patch development Group: System/Kernel Provides: klp-symbols = %version -%description livepatch-devel +%description %{livepatch}-devel This package brings a file named Symbols.list, which contains a list of all kernel symbols and its respective kernel object . This list is to be used by the klp-convert tool, which helps livepatch developers by enabling automatic symbol resolution. -%files livepatch-devel +%files %{livepatch}-devel %defattr(-, root, root) %dir %obj_install_dir %dir %obj_install_dir/%cpu_arch ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.625383389 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.625383389 +0200 @@ -18,10 +18,11 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %define vanilla_only 0 %define compress_modules none +%define livepatch %{nil} %include %_sourcedir/kernel-spec-macros @@ -63,9 +64,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -170,10 +171,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71 -Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0 +Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0 # END COMMON DEPS -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -1296,42 +1297,46 @@ /usr/src/linux-obj/%kmp_target_cpu %endif -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" -%package livepatch -Summary: Metapackage to pull in matching kernel-livepatch package +%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" +%if %livepatch == kgraft +%define patch_package %{livepatch}-patch +%else +%define patch_package kernel-%{livepatch} +%endif +%package %{livepatch} +Summary: Metapackage to pull in matching %patch_package package Group: System/Kernel -Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor +Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor} Provides: kernel-default-kgraft = %version Provides: kernel-xen-kgraft = %version Provides: multiversion(kernel) Obsoletes: kernel-default-kgraft < %version Obsoletes: kernel-xen-kgraft < %version -%description livepatch -This is a metapackage that pulls in the matching kernel-livepatch package for a +%description %{livepatch} +This is a metapackage that pulls in the matching %patch_package package for a given kernel version. The advantage of the metapackage is that its name is -static, unlike the kernel-livepatch-<kernel-version>-flavor package names. +static, unlike the %{patch_package}-<kernel-version>-flavor package names. -%files livepatch +%files %{livepatch} # rpmlint complains about empty packages, so lets own something %defattr(-, root, root) %dir /lib/modules/%kernelrelease-%build_flavor %endif -%if 0%{?klp_symbols} - -%package livepatch-devel -Summary: Kernel symbols file used during livepatch development +%if 0%{?klp_symbols} && "%livepatch" != "" +%package %{livepatch}-devel +Summary: Kernel symbols file used during kGraft patch development Group: System/Kernel Provides: klp-symbols = %version -%description livepatch-devel +%description %{livepatch}-devel This package brings a file named Symbols.list, which contains a list of all kernel symbols and its respective kernel object . This list is to be used by the klp-convert tool, which helps livepatch developers by enabling automatic symbol resolution. -%files livepatch-devel +%files %{livepatch}-devel %defattr(-, root, root) %dir %obj_install_dir %dir %obj_install_dir/%cpu_arch ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.641383386 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.641383386 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 5.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 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.zh2xi6/_old 2019-09-02 13:18:29.665383383 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.665383383 +0200 @@ -18,10 +18,11 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %define vanilla_only 0 %define compress_modules none +%define livepatch %{nil} %include %_sourcedir/kernel-spec-macros @@ -63,9 +64,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0 Group: System/Kernel -Version: 5.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -170,10 +171,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71 -Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0 +Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0 # END COMMON DEPS -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1210,42 +1211,46 @@ /usr/src/linux-obj/%kmp_target_cpu %endif -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" -%package livepatch -Summary: Metapackage to pull in matching kernel-livepatch package +%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" +%if %livepatch == kgraft +%define patch_package %{livepatch}-patch +%else +%define patch_package kernel-%{livepatch} +%endif +%package %{livepatch} +Summary: Metapackage to pull in matching %patch_package package Group: System/Kernel -Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor +Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor} Provides: kernel-default-kgraft = %version Provides: kernel-xen-kgraft = %version Provides: multiversion(kernel) Obsoletes: kernel-default-kgraft < %version Obsoletes: kernel-xen-kgraft < %version -%description livepatch -This is a metapackage that pulls in the matching kernel-livepatch package for a +%description %{livepatch} +This is a metapackage that pulls in the matching %patch_package package for a given kernel version. The advantage of the metapackage is that its name is -static, unlike the kernel-livepatch-<kernel-version>-flavor package names. +static, unlike the %{patch_package}-<kernel-version>-flavor package names. -%files livepatch +%files %{livepatch} # rpmlint complains about empty packages, so lets own something %defattr(-, root, root) %dir /lib/modules/%kernelrelease-%build_flavor %endif -%if 0%{?klp_symbols} - -%package livepatch-devel -Summary: Kernel symbols file used during livepatch development +%if 0%{?klp_symbols} && "%livepatch" != "" +%package %{livepatch}-devel +Summary: Kernel symbols file used during kGraft patch development Group: System/Kernel Provides: klp-symbols = %version -%description livepatch-devel +%description %{livepatch}-devel This package brings a file named Symbols.list, which contains a list of all kernel symbols and its respective kernel object . This list is to be used by the klp-convert tool, which helps livepatch developers by enabling automatic symbol resolution. -%files livepatch-devel +%files %{livepatch}-devel %defattr(-, root, root) %dir %obj_install_dir %dir %obj_install_dir/%cpu_arch kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.693383379 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.693383379 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-5878ee66182973951394c95f74851a1df456dd71 +BuildRequires: kernel%kernel_flavor-srchash-638511006109a60917e424dc002a3599671ec2c0 %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.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.705383377 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.705383377 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.2.10 +%define patchversion 5.2.11 %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.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.721383374 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.721383374 +0200 @@ -18,10 +18,11 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %define vanilla_only 0 %define compress_modules none +%define livepatch %{nil} %include %_sourcedir/kernel-spec-macros @@ -63,9 +64,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 5.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -170,10 +171,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71 -Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0 +Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0 # END COMMON DEPS -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -1252,42 +1253,46 @@ /usr/src/linux-obj/%kmp_target_cpu %endif -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" -%package livepatch -Summary: Metapackage to pull in matching kernel-livepatch package +%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" +%if %livepatch == kgraft +%define patch_package %{livepatch}-patch +%else +%define patch_package kernel-%{livepatch} +%endif +%package %{livepatch} +Summary: Metapackage to pull in matching %patch_package package Group: System/Kernel -Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor +Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor} Provides: kernel-default-kgraft = %version Provides: kernel-xen-kgraft = %version Provides: multiversion(kernel) Obsoletes: kernel-default-kgraft < %version Obsoletes: kernel-xen-kgraft < %version -%description livepatch -This is a metapackage that pulls in the matching kernel-livepatch package for a +%description %{livepatch} +This is a metapackage that pulls in the matching %patch_package package for a given kernel version. The advantage of the metapackage is that its name is -static, unlike the kernel-livepatch-<kernel-version>-flavor package names. +static, unlike the %{patch_package}-<kernel-version>-flavor package names. -%files livepatch +%files %{livepatch} # rpmlint complains about empty packages, so lets own something %defattr(-, root, root) %dir /lib/modules/%kernelrelease-%build_flavor %endif -%if 0%{?klp_symbols} - -%package livepatch-devel -Summary: Kernel symbols file used during livepatch development +%if 0%{?klp_symbols} && "%livepatch" != "" +%package %{livepatch}-devel +Summary: Kernel symbols file used during kGraft patch development Group: System/Kernel Provides: klp-symbols = %version -%description livepatch-devel +%description %{livepatch}-devel This package brings a file named Symbols.list, which contains a list of all kernel symbols and its respective kernel object . This list is to be used by the klp-convert tool, which helps livepatch developers by enabling automatic symbol resolution. -%files livepatch-devel +%files %{livepatch}-devel %defattr(-, root, root) %dir %obj_install_dir %dir %obj_install_dir/%cpu_arch ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.741383371 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.741383371 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %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.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.757383369 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.757383369 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 5.2.10 +Version: 5.2.11 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -50,12 +50,9 @@ %ifarch %ix86 Requires: kernel-pae-devel = %version-%source_rel %endif -%ifarch s390x -Requires: kernel-zfcpdump-devel = %version-%source_rel -%endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.769383367 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.769383367 +0200 @@ -18,10 +18,11 @@ %define srcversion 5.2 -%define patchversion 5.2.10 +%define patchversion 5.2.11 %define variant %{nil} %define vanilla_only 0 %define compress_modules none +%define livepatch %{nil} %include %_sourcedir/kernel-spec-macros @@ -63,9 +64,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 5.2.10 +Version: 5.2.11 %if 0%{?is_kotd} -Release: <RELEASE>.g5878ee6 +Release: <RELEASE>.g6385110 %else Release: 0 %endif @@ -170,10 +171,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71 -Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0 +Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0 # END COMMON DEPS -Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71 +Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1196,42 +1197,46 @@ /usr/src/linux-obj/%kmp_target_cpu %endif -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" -%package livepatch -Summary: Metapackage to pull in matching kernel-livepatch package +%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" +%if %livepatch == kgraft +%define patch_package %{livepatch}-patch +%else +%define patch_package kernel-%{livepatch} +%endif +%package %{livepatch} +Summary: Metapackage to pull in matching %patch_package package Group: System/Kernel -Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor +Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor} Provides: kernel-default-kgraft = %version Provides: kernel-xen-kgraft = %version Provides: multiversion(kernel) Obsoletes: kernel-default-kgraft < %version Obsoletes: kernel-xen-kgraft < %version -%description livepatch -This is a metapackage that pulls in the matching kernel-livepatch package for a +%description %{livepatch} +This is a metapackage that pulls in the matching %patch_package package for a given kernel version. The advantage of the metapackage is that its name is -static, unlike the kernel-livepatch-<kernel-version>-flavor package names. +static, unlike the %{patch_package}-<kernel-version>-flavor package names. -%files livepatch +%files %{livepatch} # rpmlint complains about empty packages, so lets own something %defattr(-, root, root) %dir /lib/modules/%kernelrelease-%build_flavor %endif -%if 0%{?klp_symbols} - -%package livepatch-devel -Summary: Kernel symbols file used during livepatch development +%if 0%{?klp_symbols} && "%livepatch" != "" +%package %{livepatch}-devel +Summary: Kernel symbols file used during kGraft patch development Group: System/Kernel Provides: klp-symbols = %version -%description livepatch-devel +%description %{livepatch}-devel This package brings a file named Symbols.list, which contains a list of all kernel symbols and its respective kernel object . This list is to be used by the klp-convert tool, which helps livepatch developers by enabling automatic symbol resolution. -%files livepatch-devel +%files %{livepatch}-devel %defattr(-, root, root) %dir %obj_install_dir %dir %obj_install_dir/%cpu_arch kernel-zfcpdump.spec: same change ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.905383346 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.909383345 +0200 @@ -1,5 +1,5 @@ <constraints> - <!-- Default 25GB for binary packages --> + <!-- Default 35GB for binary packages --> <overwrite> <conditions> <package>kernel-64kb</package> @@ -13,7 +13,7 @@ </conditions> <hardware> <disk> - <size unit="G">25</size> + <size unit="G">35</size> </disk> <memory> <size unit="G">4</size> @@ -49,7 +49,7 @@ </hardware> </overwrite> - <!-- 10GB of disk and 2GB of memory for binary package on s390x --> + <!-- 14GB for binary package on s390x --> <overwrite> <conditions> <arch>s390x</arch> @@ -64,7 +64,7 @@ </conditions> <hardware> <disk> - <size unit="G">10</size> + <size unit="G">14</size> </disk> <memory> <size unit="G">2</size> ++++++ check-module-license ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.941383341 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.941383341 +0200 @@ -1,7 +1,7 @@ #!/bin/sh rc=0 -for file in $(find "$@" -name '*.ko'); do +for file in $(find "$@" -name '*.ko' -o -name '*.ko.xz'); do l=$(/sbin/modinfo -F license "$file") if [ -z "$l" ]; then echo "ERROR: No license is included for module ${file##*/lib/modules/}" ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.989383333 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.989383333 +0200 @@ -39,4 +39,4 @@ +s390x s390x/default +s390x s390x/vanilla -+s390x s390x/zfcpdump ++s390x -syms s390x/zfcpdump ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default --- old/config/arm64/default 2019-08-18 18:12:47.000000000 +0200 +++ new/config/arm64/default 2019-08-26 08:55:09.000000000 +0200 @@ -4499,7 +4499,7 @@ # CONFIG_I2C_EXYNOS5 is not set CONFIG_I2C_GPIO=m # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set -# CONFIG_I2C_IMX is not set +CONFIG_I2C_IMX=m CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_KEMPLD=m CONFIG_I2C_MESON=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2019-08-18 18:12:47.000000000 +0200 +++ new/config/i386/pae 2019-08-26 08:55:09.000000000 +0200 @@ -408,7 +408,7 @@ CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y +# CONFIG_MICROCODE_OLD_INTERFACE is not set CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2019-08-18 18:12:47.000000000 +0200 +++ new/config/x86_64/default 2019-08-26 08:55:09.000000000 +0200 @@ -397,7 +397,7 @@ CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y +# CONFIG_MICROCODE_OLD_INTERFACE is not set CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_X86_5LEVEL is not set ++++++ constraints.in ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.241383294 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.245383294 +0200 @@ -1,12 +1,12 @@ <constraints> - <!-- Default 25GB for binary packages --> + <!-- Default 35GB for binary packages --> <overwrite> <conditions> @BINARY_PACKAGES_XML@ </conditions> <hardware> <disk> - <size unit="G">25</size> + <size unit="G">35</size> </disk> <memory> <size unit="G">4</size> @@ -42,7 +42,7 @@ </hardware> </overwrite> - <!-- 10GB of disk and 2GB of memory for binary package on s390x --> + <!-- 14GB for binary package on s390x --> <overwrite> <conditions> <arch>s390x</arch> @@ -50,7 +50,7 @@ </conditions> <hardware> <disk> - <size unit="G">10</size> + <size unit="G">14</size> </disk> <memory> <size unit="G">2</size> ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.341383279 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.341383279 +0200 @@ -22,6 +22,7 @@ %define variant @VARIANT@%{nil} %define vanilla_only @VANILLA_ONLY@ %define compress_modules @COMPRESS_MODULES@ +%define livepatch @LIVEPATCH@%{nil} %include %_sourcedir/kernel-spec-macros @@ -1056,42 +1057,46 @@ /usr/src/linux-obj/%kmp_target_cpu %endif -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" -%package livepatch -Summary: Metapackage to pull in matching kernel-livepatch package +%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == "" +%if %livepatch == kgraft +%define patch_package %{livepatch}-patch +%else +%define patch_package kernel-%{livepatch} +%endif +%package %{livepatch} +Summary: Metapackage to pull in matching %patch_package package Group: System/Kernel -Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor +Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor} Provides: kernel-default-kgraft = %version Provides: kernel-xen-kgraft = %version Provides: multiversion(kernel) Obsoletes: kernel-default-kgraft < %version Obsoletes: kernel-xen-kgraft < %version -%description livepatch -This is a metapackage that pulls in the matching kernel-livepatch package for a +%description %{livepatch} +This is a metapackage that pulls in the matching %patch_package package for a given kernel version. The advantage of the metapackage is that its name is -static, unlike the kernel-livepatch-<kernel-version>-flavor package names. +static, unlike the %{patch_package}-<kernel-version>-flavor package names. -%files livepatch +%files %{livepatch} # rpmlint complains about empty packages, so lets own something %defattr(-, root, root) %dir /lib/modules/%kernelrelease-%build_flavor %endif -%if 0%{?klp_symbols} - -%package livepatch-devel -Summary: Kernel symbols file used during livepatch development +%if 0%{?klp_symbols} && "%livepatch" != "" +%package %{livepatch}-devel +Summary: Kernel symbols file used during kGraft patch development Group: System/Kernel Provides: klp-symbols = %version -%description livepatch-devel +%description %{livepatch}-devel This package brings a file named Symbols.list, which contains a list of all kernel symbols and its respective kernel object . This list is to be used by the klp-convert tool, which helps livepatch developers by enabling automatic symbol resolution. -%files livepatch-devel +%files %{livepatch}-devel %defattr(-, root, root) %dir %obj_install_dir %dir %obj_install_dir/%cpu_arch ++++++ kernel-module-subpackage ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.405383269 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.409383269 +0200 @@ -79,7 +79,7 @@ %{?regenerate_initrd_posttrans} %preun -n %{-n*}-kmp-%1 nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*} -rpm -ql $nvr | sed -n '/\.ko$/p' > /var/run/rpm-$nvr-modules +rpm -ql $nvr | sed -n '/\.ko\(\.xz\)\?$/p' > /var/run/rpm-$nvr-modules %postun -n %{-n*}-kmp-%1 nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*} modules=( $(cat /var/run/rpm-$nvr-modules) ) ++++++ mergedep ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.541383248 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.541383248 +0200 @@ -7,10 +7,12 @@ | \ while read l ; do MOD=$(echo "$l" | sed -e 's/:.*//') + MOD=$(basename $MOD .xz) MOD=$(basename $MOD .ko) DEPS="$(echo "$l" | sed -e 's/.*://')" moddeps="" for dep in $DEPS ; do + dep=$(basename $dep .xz) dep=$(basename $dep .ko) moddeps="$moddeps $dep" done ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.549383247 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.549383247 +0200 @@ -38,9 +38,19 @@ my ($srcversion, $variant, $vanilla_only) = ($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'}); my $compress_modules = 'none'; +my $build_dtbs = (); +my $livepatch = ""; if (defined($vars{'COMPRESS_MODULES'})) { $compress_modules = $vars{'COMPRESS_MODULES'}; } +if (defined($vars{'BUILD_DTBS'})) { + $build_dtbs = $vars{'BUILD_DTBS'}; + $build_dtbs = () if $build_dtbs =~ /^(0+|no|false)$/i; +} +if (defined($vars{'LIVEPATCH'})) { + $livepatch = $vars{'LIVEPATCH'}; + $livepatch = "" if $livepatch =~ /^(0+|no|none)$/i; +} $vanilla_only ||= "0"; if (!defined ($rpmrelease)) { $rpmrelease = $vars{'RELEASE'} || 0; @@ -80,7 +90,8 @@ my $tarball_url; if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) { $tarball_url = "http://www.kernel.org/pub/linux/kernel/v$1.x/"; - $tarball_url .= "testing/" if $2; + $tarball_url = "" if $2; # kernel.org has no tarballs for rc kernels + # rc tarballs only available from git as https://git.kernel.org/torvalds/t/linux-*.gz } else { # kernel.org has no tarballs for linux-next or vanilla snapshots $tarball_url = ""; @@ -103,6 +114,7 @@ NOSOURCE => $nosource, UNPACK_PATCHES => $unpack_patches, SCRIPTS => $scripts, + LIVEPATCH => $livepatch, YEAR => (localtime time)[5] + 1900, COMPRESS_MODULES => $compress_modules, ); @@ -209,7 +221,7 @@ } # dtb-*.spec -if (!$variant) { +if (!$variant && $build_dtbs) { do_spec('dtb', "dtb.spec.in", %macros); print "./mkspec-dtb $all_archs\n"; system("./mkspec-dtb $all_archs\n"); ++++++ modflist ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.577383242 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.577383242 +0200 @@ -6,5 +6,5 @@ while read MOD ; do [ -n "$MOD" ] || continue - cat $flist | grep /$MOD[.]ko\$ >> $output || { grep -q /$MOD[.]ko\$ $mod_builtin && echo Module $MOD built-in ;} || echo Module $MOD missing + cat $flist | grep -E "/$MOD[.]ko([.]xz)?\$" >> $output || { grep -q /$MOD[.]ko\$ $mod_builtin && echo Module $MOD built-in ;} || echo Module $MOD missing done < $modules ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 13385 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch new/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch --- old/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch 2019-08-29 08:41:19.000000000 +0200 @@ -0,0 +1,40 @@ +From: Hui Peng <benquike@gmail.com> +Date: Mon, 19 Aug 2019 18:02:29 -0400 +Subject: Fix a double free bug in rsi_91x_deinit +References: bnc#1147116 CVE-2019-15504 +Patch-mainline: Submitted, http://patchwork.ozlabs.org/patch/1149623/ + +`dev` (struct rsi_91x_usbdev *) field of adapter +(struct rsi_91x_usbdev *) is allocated and initialized in +`rsi_init_usb_interface`. If any error is detected in information +read from the device side, `rsi_init_usb_interface` will be +freed. However, in the higher level error handling code in +`rsi_probe`, if error is detected, `rsi_91x_deinit` is called +again, in which `dev` will be freed again, resulting double free. + +This patch fixes the double free by removing the free operation on +`dev` in `rsi_init_usb_interface`, because `rsi_91x_deinit` is also +used in `rsi_disconnect`, in that code path, the `dev` field is not + (and thus needs to be) freed. + +This bug was found in v4.19, but is also present in the latest version +of kernel. + +Reported-by: Hui Peng <benquike@gmail.com> +Reported-by: Mathias Payer <mathias.payer@nebelwelt.net> +Signed-off-by: Hui Peng <benquike@gmail.com> +Acked-by: Benjamin Poirier <bpoirier@suse.com> +--- + drivers/net/wireless/rsi/rsi_91x_usb.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/net/wireless/rsi/rsi_91x_usb.c ++++ b/drivers/net/wireless/rsi/rsi_91x_usb.c +@@ -645,7 +645,6 @@ fail_rx: + kfree(rsi_dev->tx_buffer); + + fail_eps: +- kfree(rsi_dev); + + return status; + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch new/patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch --- old/patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch 2019-08-29 08:41:19.000000000 +0200 @@ -0,0 +1,75 @@ +From: Wen Huang <huangwenabc@gmail.com> +Subject: [PATCH] mwifiex: Fix three heap overflow at parsing element in + cfg80211_ap_settings +Date: Wed, 28 Aug 2019 10:07:51 +0800 +Message-id: <20190828020751.13625-1-huangwenabc@gmail.com> +Patch-mainline: Submitted, https://patchwork.kernel.org/patch/11117681/ +References: CVE-2019-14814,bsc#1146512,CVE-2019-14815,bsc#1146514,CVE-2019-14816,bsc#1146516 + +mwifiex_update_vs_ie(),mwifiex_set_uap_rates() and +mwifiex_set_wmm_params() call memcpy() without checking +the destination size.Since the source is given from +user-space, this may trigger a heap buffer overflow. + +Fix them by putting the length check before performing memcpy(). + +This fix addresses CVE-2019-14814,CVE-2019-14815,CVE-2019-14816. + +Signed-off-by: Wen Huang <huangwenabc@gmail.com> +Acked-by: Ganapathi Bhat <gbhat@marvell.comg> +Signed-off-by: Takashi Iwai <tiwai@suse.de> + +--- + drivers/net/wireless/marvell/mwifiex/ie.c | 3 +++ + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 9 ++++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c +index 653d347a9..580387f9f 100644 +--- a/drivers/net/wireless/marvell/mwifiex/ie.c ++++ b/drivers/net/wireless/marvell/mwifiex/ie.c +@@ -241,6 +241,9 @@ static int mwifiex_update_vs_ie(const u8 *ies, int ies_len, + } + + vs_ie = (struct ieee_types_header *)vendor_ie; ++ if (le16_to_cpu(ie->ie_length) + vs_ie->len + 2 > ++ IEEE_MAX_IE_SIZE) ++ return -EINVAL; + memcpy(ie->ie_buffer + le16_to_cpu(ie->ie_length), + vs_ie, vs_ie->len + 2); + le16_unaligned_add_cpu(&ie->ie_length, vs_ie->len + 2); +diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c +index 18f7d9bf3..0939a8c8f 100644 +--- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c ++++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c +@@ -265,6 +265,8 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg, + + rate_ie = (void *)cfg80211_find_ie(WLAN_EID_SUPP_RATES, var_pos, len); + if (rate_ie) { ++ if (rate_ie->len > MWIFIEX_SUPPORTED_RATES) ++ return; + memcpy(bss_cfg->rates, rate_ie + 1, rate_ie->len); + rate_len = rate_ie->len; + } +@@ -272,8 +274,11 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg, + rate_ie = (void *)cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES, + params->beacon.tail, + params->beacon.tail_len); +- if (rate_ie) ++ if (rate_ie) { ++ if (rate_ie->len > MWIFIEX_SUPPORTED_RATES - rate_len) ++ return; + memcpy(bss_cfg->rates + rate_len, rate_ie + 1, rate_ie->len); ++ } + + return; + } +@@ -391,6 +396,8 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv, + params->beacon.tail_len); + if (vendor_ie) { + wmm_ie = vendor_ie; ++ if (*(wmm_ie + 1) > sizeof(struct mwifiex_types_wmm_info)) ++ return; + memcpy(&bss_cfg->wmm_info, wmm_ie + + sizeof(struct ieee_types_header), *(wmm_ie + 1)); + priv->wmm_enabled = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/net-ath10k-Fix-a-NULL-ptr-deref-bug.patch new/patches.suse/net-ath10k-Fix-a-NULL-ptr-deref-bug.patch --- old/patches.suse/net-ath10k-Fix-a-NULL-ptr-deref-bug.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/net-ath10k-Fix-a-NULL-ptr-deref-bug.patch 2019-08-29 08:41:19.000000000 +0200 @@ -0,0 +1,69 @@ +From: Hui Peng <benquike@gmail.com> +Subject: [PATCH] Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe +Date: Sat, 3 Aug 2019 20:31:01 -0400 +Message-id: <20190804003101.11541-1-benquike@gmail.com> +Patch-mainline: Submitted, https://patchwork.kernel.org/patch/11074657/ +References: CVE-2019-15099,bsc#1146368 + +The `ar_usb` field of `ath10k_usb_pipe_usb_pipe` objects +are initialized to point to the containing `ath10k_usb` object +according to endpoint descriptors read from the device side, as shown +below in `ath10k_usb_setup_pipe_resources`: + +for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { + endpoint = &iface_desc->endpoint[i].desc; + + // get the address from endpoint descriptor + pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, + endpoint->bEndpointAddress, + &urbcount); + ...... + // select the pipe object + pipe = &ar_usb->pipes[pipe_num]; + + // initialize the ar_usb field + pipe->ar_usb = ar_usb; +} + +The driver assumes that the addresses reported in endpoint +descriptors from device side to be complete. If a device is +malicious and does not report complete addresses, it may trigger +NULL-ptr-deref `ath10k_usb_alloc_urb_from_pipe` and +`ath10k_usb_free_urb_to_pipe`. + +This patch fixes the bug by preventing potential NULL-ptr-deref. + +Signed-off-by: Hui Peng <benquike@gmail.com> +Reported-by: Hui Peng <benquike@gmail.com> +Reported-by: Mathias Payer <mathias.payer@nebelwelt.net> +Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Takashi Iwai <tiwai@suse.de> + +--- + drivers/net/wireless/ath/ath10k/usb.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/net/wireless/ath/ath10k/usb.c ++++ b/drivers/net/wireless/ath/ath10k/usb.c +@@ -38,6 +38,10 @@ ath10k_usb_alloc_urb_from_pipe(struct at + struct ath10k_urb_context *urb_context = NULL; + unsigned long flags; + ++ /* bail if this pipe is not initialized */ ++ if (!pipe->ar_usb) ++ return NULL; ++ + spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags); + if (!list_empty(&pipe->urb_list_head)) { + urb_context = list_first_entry(&pipe->urb_list_head, +@@ -55,6 +59,10 @@ static void ath10k_usb_free_urb_to_pipe( + { + unsigned long flags; + ++ /* bail if this pipe is not initialized */ ++ if (!pipe->ar_usb) ++ return; ++ + spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags); + + pipe->urb_cnt++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/net-ath6kl-Fix-a-NULL-ptr-deref-bug.patch new/patches.suse/net-ath6kl-Fix-a-NULL-ptr-deref-bug.patch --- old/patches.suse/net-ath6kl-Fix-a-NULL-ptr-deref-bug.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/net-ath6kl-Fix-a-NULL-ptr-deref-bug.patch 2019-08-29 08:41:19.000000000 +0200 @@ -0,0 +1,69 @@ +From: Hui Peng <benquike@gmail.com> +Subject: [PATCH] Fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe +Date: Sat, 3 Aug 2019 20:29:04 -0400 +Message-id: <20190804002905.11292-1-benquike@gmail.com> +Patch-mainline: Submitted, https://patchwork.kernel.org/patch/11074655/ +References: CVE-2019-15098,bsc#1146378,CVE-2019-15290,bsc#1146543 + +The `ar_usb` field of `ath6kl_usb_pipe_usb_pipe` objects +are initialized to point to the containing `ath6kl_usb` object +according to endpoint descriptors read from the device side, as shown +below in `ath6kl_usb_setup_pipe_resources`: + +for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { + endpoint = &iface_desc->endpoint[i].desc; + + // get the address from endpoint descriptor + pipe_num = ath6kl_usb_get_logical_pipe_num(ar_usb, + endpoint->bEndpointAddress, + &urbcount); + ...... + // select the pipe object + pipe = &ar_usb->pipes[pipe_num]; + + // initialize the ar_usb field + pipe->ar_usb = ar_usb; +} + +The driver assumes that the addresses reported in endpoint +descriptors from device side to be complete. If a device is +malicious and does not report complete addresses, it may trigger +NULL-ptr-deref `ath6kl_usb_alloc_urb_from_pipe` and +`ath6kl_usb_free_urb_to_pipe`. + +This patch fixes the bug by preventing potential NULL-ptr-deref. + +Signed-off-by: Hui Peng <benquike@gmail.com> +Reported-by: Hui Peng <benquike@gmail.com> +Reported-by: Mathias Payer <mathias.payer@nebelwelt.net> +Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Takashi Iwai <tiwai@suse.de> + +--- + drivers/net/wireless/ath/ath6kl/usb.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/net/wireless/ath/ath6kl/usb.c ++++ b/drivers/net/wireless/ath/ath6kl/usb.c +@@ -132,6 +132,10 @@ ath6kl_usb_alloc_urb_from_pipe(struct at + struct ath6kl_urb_context *urb_context = NULL; + unsigned long flags; + ++ /* bail if this pipe is not initialized */ ++ if (!pipe->ar_usb) ++ return NULL; ++ + spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags); + if (!list_empty(&pipe->urb_list_head)) { + urb_context = +@@ -150,6 +154,10 @@ static void ath6kl_usb_free_urb_to_pipe( + { + unsigned long flags; + ++ /* bail if this pipe is not initialized */ ++ if (!pipe->ar_usb) ++ return; ++ + spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags); + pipe->urb_cnt++; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/x86-apic-Handle-missing-global-clockevent-gracefully.patch new/patches.suse/x86-apic-Handle-missing-global-clockevent-gracefully.patch --- old/patches.suse/x86-apic-Handle-missing-global-clockevent-gracefully.patch 2019-08-25 19:33:34.000000000 +0200 +++ new/patches.suse/x86-apic-Handle-missing-global-clockevent-gracefully.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,172 +0,0 @@ -From: Thomas Gleixner <tglx@linutronix.de> -Date: Fri, 9 Aug 2019 14:54:07 +0200 -Subject: x86/apic: Handle missing global clockevent gracefully -Patch-mainline: submitted on 2019/08/09 -References: bnc#1142926 - -Some newer machines do not advertise legacy timers. The kernel can handle -that situation if the TSC and the CPU frequency are enumerated by CPUID or -MSRs and the CPU supports TSC deadline timer. If the CPU does not support -TSC deadline timer the local APIC timer frequency has to be known as well. - -Some Ryzens machines do not advertize legacy timers, but there is no -reliable way to determine the bus frequency which feeds the local APIC -timer when the machine allows overclocking of that frequency. - -As there is no legacy timer the local APIC timer calibration crashes due to -a NULL pointer dereference when accessing the not installed global clock -event device. - -Switch the calibration loop to a non interrupt based one, which polls -either TSC (frequency known) or jiffies. The latter requires a global -clockevent. As the machines which do not have a global clockevent installed -have a known TSC frequency this is a non issue. For older machines where -TSC frequency is not known, there is no known case where the legacy timers -do not exist as that would have been reported long ago. - -Reported-by: Daniel Drake <drake@endlessm.com> -Reported-by: Jiri Slaby <jslaby@suse.cz> -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Signed-off-by: Jiri Slaby <jslaby@suse.cz> ---- - arch/x86/kernel/apic/apic.c | 70 ++++++++++++++++++++++++++++--------- - include/linux/acpi_pmtmr.h | 10 ++++++ - 2 files changed, 64 insertions(+), 16 deletions(-) - -diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c -index 831274e3c09f..ee3f570b3482 100644 ---- a/arch/x86/kernel/apic/apic.c -+++ b/arch/x86/kernel/apic/apic.c -@@ -851,7 +851,8 @@ bool __init apic_needs_pit(void) - static int __init calibrate_APIC_clock(void) - { - struct clock_event_device *levt = this_cpu_ptr(&lapic_events); -- void (*real_handler)(struct clock_event_device *dev); -+ u64 tsc_perj = 0, tsc_start = 0; -+ unsigned long jif_start; - unsigned long deltaj; - long delta, deltatsc; - int pm_referenced = 0; -@@ -878,28 +879,64 @@ static int __init calibrate_APIC_clock(void) - apic_printk(APIC_VERBOSE, "Using local APIC timer interrupts.\n" - "calibrating APIC timer ...\n"); - -- local_irq_disable(); -- -- /* Replace the global interrupt handler */ -- real_handler = global_clock_event->event_handler; -- global_clock_event->event_handler = lapic_cal_handler; -+ /* -+ * There are platforms w/o global clockevent devices. Instead of -+ * making the calibration conditional on that, use a polling based -+ * approach everywhere. -+ */ - -+ local_irq_disable(); - /* - * Setup the APIC counter to maximum. There is no way the lapic - * can underflow in the 100ms detection time frame - */ - __setup_APIC_LVTT(0xffffffff, 0, 0); - -- /* Let the interrupts run */ -- local_irq_enable(); -+ /* -+ * Methods to terminate the calibration loop: -+ * 1) Global clockevent if available (jiffies) -+ * 2) TSC if available and frequency is known -+ */ -+ jif_start = READ_ONCE(jiffies); - -- while (lapic_cal_loops <= LAPIC_CAL_LOOPS) -- cpu_relax(); -+ if (tsc_khz) { -+ tsc_start = rdtsc(); -+ tsc_perj = div_u64((u64)tsc_khz * 1000, HZ); -+ } - -- local_irq_disable(); -+ while (lapic_cal_loops <= LAPIC_CAL_LOOPS) { -+ /* -+ * Enable interrupts so the tick can fire, if a global -+ * clockevent device is available -+ */ -+ local_irq_enable(); -+ -+ /* Wait for a tick to elapse */ -+ while (1) { -+ if (tsc_khz) { -+ u64 tsc_now = rdtsc(); -+ if ((tsc_now - tsc_start) >= tsc_perj) { -+ tsc_start += tsc_perj; -+ break; -+ } -+ } else { -+ unsigned long jif_now = READ_ONCE(jiffies); -+ -+ if (time_after(jif_now, jif_start)) { -+ jif_start = jif_now; -+ break; -+ } -+ } -+ cpu_relax(); -+ } - -- /* Restore the real event handler */ -- global_clock_event->event_handler = real_handler; -+ /* Invoke the calibration routine */ -+ local_irq_disable(); -+ lapic_cal_handler(NULL); -+ local_irq_enable(); -+ } -+ -+ local_irq_disable(); - - /* Build delta t1-t2 as apic timer counts down */ - delta = lapic_cal_t1 - lapic_cal_t2; -@@ -943,10 +980,11 @@ static int __init calibrate_APIC_clock(void) - levt->features &= ~CLOCK_EVT_FEAT_DUMMY; - - /* -- * PM timer calibration failed or not turned on -- * so lets try APIC timer based calibration -+ * PM timer calibration failed or not turned on so lets try APIC -+ * timer based calibration, if a global clockevent device is -+ * available. - */ -- if (!pm_referenced) { -+ if (!pm_referenced && global_clock_event) { - apic_printk(APIC_VERBOSE, "... verify APIC timer\n"); - - /* -diff --git a/include/linux/acpi_pmtmr.h b/include/linux/acpi_pmtmr.h -index 50d88bf1498d..0e0b4026ef05 100644 ---- a/include/linux/acpi_pmtmr.h -+++ b/include/linux/acpi_pmtmr.h -@@ -18,6 +18,11 @@ - extern u32 acpi_pm_read_verified(void); - extern u32 pmtmr_ioport; - -+static inline bool acpi_pm_timer_available(void) -+{ -+ return pmtmr_ioport != 0; -+} -+ - static inline u32 acpi_pm_read_early(void) - { - if (!pmtmr_ioport) -@@ -28,6 +33,11 @@ static inline u32 acpi_pm_read_early(void) - - #else - -+static inline bool acpi_pm_timer_available(void) -+{ -+ return false; -+} -+ - static inline u32 acpi_pm_read_early(void) - { - return 0; --- -2.22.0 - ++++++ preun.sh ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:31.309383130 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:31.309383130 +0200 @@ -1,4 +1,4 @@ if [ @BASE_PACKAGE@ = 0 ]; then nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ - rpm -ql $nvr | grep '\.ko$' > /var/run/rpm-$nvr-modules + rpm -ql $nvr | grep '\.ko\(\.xz\)\?$' > /var/run/rpm-$nvr-modules fi ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:31.333383127 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:31.337383125 +0200 @@ -1301,6 +1301,171 @@ patches.kernel.org/5.2.10-133-net-phy-consider-AN_RESTART-status-when-readin.patch patches.kernel.org/5.2.10-134-netlink-Fix-nlmsg_parse-as-a-wrapper-for-stric.patch patches.kernel.org/5.2.10-135-Linux-5.2.10.patch + patches.kernel.org/5.2.11-001-ASoC-simple_card_utils.h-care-NULL-dai-at-asoc.patch + patches.kernel.org/5.2.11-002-ASoC-simple-card-fix-an-use-after-free-in-simp.patch + patches.kernel.org/5.2.11-003-ASoC-simple-card-fix-an-use-after-free-in-simp.patch + patches.kernel.org/5.2.11-004-ASoC-audio-graph-card-fix-use-after-free-in-gr.patch + patches.kernel.org/5.2.11-005-ASoC-audio-graph-card-fix-an-use-after-free-in.patch + patches.kernel.org/5.2.11-006-ASoC-audio-graph-card-add-missing-const-at-gra.patch + patches.kernel.org/5.2.11-007-regulator-axp20x-fix-DCDCA-and-DCDCD-for-AXP80.patch + patches.kernel.org/5.2.11-008-regulator-axp20x-fix-DCDC5-and-DCDC6-for-AXP80.patch + patches.kernel.org/5.2.11-009-ASoC-samsung-odroid-fix-an-use-after-free-issu.patch + patches.kernel.org/5.2.11-010-ASoC-samsung-odroid-fix-a-double-free-issue-fo.patch + patches.kernel.org/5.2.11-011-ASoC-Intel-bytcht_es8316-Add-quirk-for-Irbis-N.patch + patches.kernel.org/5.2.11-012-HID-logitech-hidpp-add-USB-PID-for-a-few-more-.patch + patches.kernel.org/5.2.11-013-HID-Add-044f-b320-ThrustMaster-Inc.-2-in-1-DT.patch + patches.kernel.org/5.2.11-014-MIPS-kernel-only-use-i8253-clocksource-with-pe.patch + patches.kernel.org/5.2.11-015-mips-fix-cacheinfo.patch + patches.kernel.org/5.2.11-016-libbpf-sanitize-VAR-to-conservative-1-byte-INT.patch + patches.kernel.org/5.2.11-017-netfilter-ebtables-fix-a-memory-leak-bug-in-co.patch + patches.kernel.org/5.2.11-018-ASoC-dapm-Fix-handling-of-custom_stop_conditio.patch + patches.kernel.org/5.2.11-019-ASoC-SOF-use-__u32-instead-of-uint32_t-in-uapi.patch + patches.kernel.org/5.2.11-020-spi-pxa2xx-Balance-runtime-PM-enable-disable-o.patch + patches.kernel.org/5.2.11-021-bpf-sockmap-sock_map_delete-needs-to-use-xchg.patch + patches.kernel.org/5.2.11-022-bpf-sockmap-synchronize_rcu-before-free-ing-ma.patch + patches.kernel.org/5.2.11-023-bpf-sockmap-only-create-entry-if-ulp-is-not-al.patch + patches.kernel.org/5.2.11-024-selftests-bpf-fix-sendmsg6_prog-on-s390.patch + patches.kernel.org/5.2.11-025-ASoC-dapm-fix-a-memory-leak-bug.patch + patches.kernel.org/5.2.11-026-bonding-Force-slave-speed-check-after-link-sta.patch + patches.kernel.org/5.2.11-027-net-mvpp2-Don-t-check-for-3-consecutive-Idle-f.patch + patches.kernel.org/5.2.11-028-selftests-forwarding-gre_multipath-Enable-IPv4.patch + patches.kernel.org/5.2.11-029-selftests-forwarding-gre_multipath-Fix-flower-.patch + patches.kernel.org/5.2.11-030-selftests-bpf-add-another-gso_segs-access.patch + patches.kernel.org/5.2.11-031-libbpf-fix-using-uninitialized-ioctl-results.patch + patches.kernel.org/5.2.11-032-can-dev-call-netif_carrier_off-in-register_can.patch + patches.kernel.org/5.2.11-033-can-mcp251x-add-error-check-when-wq-alloc-fail.patch + patches.kernel.org/5.2.11-034-can-gw-Fix-error-path-of-cgw_module_init.patch + patches.kernel.org/5.2.11-035-ASoC-Fail-card-instantiation-if-DAI-format-set.patch + patches.kernel.org/5.2.11-036-Staging-fbtft-Fix-GPIO-handling.patch + patches.kernel.org/5.2.11-037-libbpf-silence-GCC8-warning-about-string-trunc.patch + patches.kernel.org/5.2.11-038-st21nfca_connectivity_event_received-null-chec.patch + patches.kernel.org/5.2.11-039-st_nci_hci_connectivity_event_received-null-ch.patch + patches.kernel.org/5.2.11-040-nl-mac-80211-fix-interface-combinations-on-cry.patch + patches.kernel.org/5.2.11-041-ASoC-ti-davinci-mcasp-Fix-clk-PDIR-handling-fo.patch + patches.kernel.org/5.2.11-042-ASoC-rockchip-Fix-mono-capture.patch + patches.kernel.org/5.2.11-043-ASoC-ti-davinci-mcasp-Correct-slot_width-posed.patch + patches.kernel.org/5.2.11-044-net-usb-qmi_wwan-Add-the-BroadMobi-BM818-card.patch + patches.kernel.org/5.2.11-045-qed-RDMA-Fix-the-hw_ver-returned-in-device-att.patch + patches.kernel.org/5.2.11-046-isdn-mISDN-hfcsusb-Fix-possible-null-pointer-d.patch + patches.kernel.org/5.2.11-047-habanalabs-fix-F-W-download-in-BE-architecture.patch + patches.kernel.org/5.2.11-048-mac80211_hwsim-Fix-possible-null-pointer-deref.patch + patches.kernel.org/5.2.11-049-net-stmmac-manage-errors-returned-by-of_get_ma.patch + patches.kernel.org/5.2.11-050-netfilter-ipset-Actually-allow-destination-MAC.patch + patches.kernel.org/5.2.11-051-netfilter-ipset-Copy-the-right-MAC-address-in-.patch + patches.kernel.org/5.2.11-052-netfilter-ipset-Fix-rename-concurrency-with-li.patch + patches.kernel.org/5.2.11-053-rxrpc-Fix-potential-deadlock.patch + patches.kernel.org/5.2.11-054-rxrpc-Fix-the-lack-of-notification-when-sendms.patch + patches.kernel.org/5.2.11-055-nvmem-Use-the-same-permissions-for-eeprom-as-f.patch + patches.kernel.org/5.2.11-056-iwlwifi-mvm-avoid-races-in-rate-init-and-rate-.patch + patches.kernel.org/5.2.11-057-iwlwifi-dbg_ini-move-iwl_dbg_tlv_load_bin-out-.patch + patches.kernel.org/5.2.11-058-iwlwifi-dbg_ini-move-iwl_dbg_tlv_free-outside-.patch + patches.kernel.org/5.2.11-059-iwlwifi-fix-locking-in-delayed-GTK-setting.patch + patches.kernel.org/5.2.11-060-iwlwifi-mvm-send-LQ-command-always-ASYNC.patch + patches.kernel.org/5.2.11-061-enetc-Fix-build-error-without-PHYLIB.patch + patches.kernel.org/5.2.11-062-isdn-hfcsusb-Fix-mISDN-driver-crash-caused-by-.patch + patches.kernel.org/5.2.11-063-net-phy-phy_led_triggers-Fix-a-possible-null-p.patch + patches.kernel.org/5.2.11-064-perf-bench-numa-Fix-cpu0-binding.patch + patches.kernel.org/5.2.11-065-spi-pxa2xx-Add-support-for-Intel-Tiger-Lake.patch + patches.kernel.org/5.2.11-066-can-sja1000-force-the-string-buffer-NULL-termi.patch + patches.kernel.org/5.2.11-067-can-peak_usb-force-the-string-buffer-NULL-term.patch + patches.kernel.org/5.2.11-068-ASoC-amd-acp3x-use-dma_ops-of-parent-device-fo.patch + patches.kernel.org/5.2.11-069-net-ethernet-qlogic-qed-force-the-string-buffe.patch + patches.kernel.org/5.2.11-070-enetc-Select-PHYLIB-while-CONFIG_FSL_ENETC_VF-.patch + patches.kernel.org/5.2.11-071-NFSv4-Fix-a-credential-refcount-leak-in-nfs41_.patch + patches.kernel.org/5.2.11-072-NFSv4-When-recovering-state-fails-with-EAGAIN-.patch + patches.kernel.org/5.2.11-073-NFSv4.1-Fix-open-stateid-recovery.patch + patches.kernel.org/5.2.11-074-NFSv4.1-Only-reap-expired-delegations.patch + patches.kernel.org/5.2.11-075-NFSv4-Fix-a-potential-sleep-while-atomic-in-nf.patch + patches.kernel.org/5.2.11-076-NFS-Fix-regression-whereby-fscache-errors-are-.patch + patches.kernel.org/5.2.11-077-HID-quirks-Set-the-INCREMENT_USAGE_ON_DUPLICAT.patch + patches.kernel.org/5.2.11-078-HID-input-fix-a4tech-horizontal-wheel-custom-u.patch + patches.kernel.org/5.2.11-079-drm-rockchip-Suspend-DP-late.patch + patches.kernel.org/5.2.11-080-SMB3-Fix-potential-memory-leak-when-processing.patch + patches.kernel.org/5.2.11-081-SMB3-Kernel-oops-mounting-a-encryptData-share-.patch + patches.kernel.org/5.2.11-082-sched-deadline-Fix-double-accounting-of-rq-run.patch + patches.kernel.org/5.2.11-083-sched-psi-Reduce-psimon-FIFO-priority.patch + patches.kernel.org/5.2.11-084-sched-psi-Do-not-require-setsched-permission-f.patch + patches.kernel.org/5.2.11-085-s390-protvirt-avoid-memory-sharing-for-diag-30.patch + patches.kernel.org/5.2.11-086-s390-mm-fix-dump_pagetables-top-level-page-tab.patch + patches.kernel.org/5.2.11-087-s390-put-_stext-and-_etext-into-.text-section.patch + patches.kernel.org/5.2.11-088-ata-rb532_cf-Fix-unused-variable-warning-in-rb.patch + patches.kernel.org/5.2.11-089-net-cxgb3_main-Fix-a-resource-leak-in-a-error-.patch + patches.kernel.org/5.2.11-090-net-stmmac-Fix-issues-when-number-of-Queues-4.patch + patches.kernel.org/5.2.11-091-net-stmmac-tc-Do-not-return-a-fragment-entry.patch + patches.kernel.org/5.2.11-092-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-g.patch + patches.kernel.org/5.2.11-093-net-hisilicon-make-hip04_tx_reclaim-non-reentr.patch + patches.kernel.org/5.2.11-094-net-hisilicon-fix-hip04-xmit-never-return-TX_B.patch + patches.kernel.org/5.2.11-095-net-hisilicon-Fix-dma_map_single-failed-on-arm.patch + patches.kernel.org/5.2.11-096-NFSv4-Ensure-state-recovery-handles-ETIMEDOUT-.patch + patches.kernel.org/5.2.11-097-libata-have-ata_scsi_rw_xlat-fail-invalid-pass.patch + patches.kernel.org/5.2.11-098-libata-add-SG-safety-checks-in-SFF-pio-transfe.patch + patches.kernel.org/5.2.11-099-x86-lib-cpu-Address-missing-prototypes-warning.patch + patches.kernel.org/5.2.11-100-drm-vmwgfx-fix-memory-leak-when-too-many-retri.patch + patches.kernel.org/5.2.11-101-block-aoe-Fix-kernel-crash-due-to-atomic-sleep.patch + patches.kernel.org/5.2.11-102-block-bfq-handle-NULL-return-value-by-bfq_init.patch + patches.kernel.org/5.2.11-103-perf-ftrace-Fix-failure-to-set-cpumask-when-on.patch + patches.kernel.org/5.2.11-104-perf-cpumap-Fix-writing-to-illegal-memory-in-h.patch + patches.kernel.org/5.2.11-105-perf-pmu-events-Fix-missing-cpu_clk_unhalted.c.patch + patches.kernel.org/5.2.11-106-dt-bindings-riscv-fix-the-schema-compatible-st.patch + patches.kernel.org/5.2.11-107-KVM-arm64-Don-t-write-junk-to-sysregs-on-reset.patch + patches.kernel.org/5.2.11-108-KVM-arm-Don-t-write-junk-to-CP15-registers-on-.patch + patches.kernel.org/5.2.11-109-selftests-kvm-Adding-config-fragments.patch + patches.kernel.org/5.2.11-110-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch + patches.kernel.org/5.2.11-111-HID-wacom-correct-misreported-EKR-ring-values.patch + patches.kernel.org/5.2.11-112-HID-wacom-Correct-distance-scale-for-2nd-gen-I.patch + patches.kernel.org/5.2.11-113-Revert-KVM-x86-mmu-Zap-only-the-relevant-pages.patch + patches.kernel.org/5.2.11-114-Revert-dm-bufio-fix-deadlock-with-loop-device.patch + patches.kernel.org/5.2.11-115-clk-socfpga-stratix10-fix-rate-caclulationg-fo.patch + patches.kernel.org/5.2.11-116-ceph-clear-page-dirty-before-invalidate-page.patch + patches.kernel.org/5.2.11-117-ceph-don-t-try-fill-file_lock-on-unsuccessful-.patch + patches.kernel.org/5.2.11-118-libceph-fix-PG-split-vs-OSD-re-connect-race.patch + patches.kernel.org/5.2.11-119-drm-amdgpu-gfx9-update-pg_flags-after-determin.patch + patches.kernel.org/5.2.11-120-drm-nouveau-Don-t-retry-infinitely-when-receiv.patch + patches.kernel.org/5.2.11-121-scsi-ufs-Fix-NULL-pointer-dereference-in-ufshc.patch + patches.kernel.org/5.2.11-122-gpiolib-never-report-open-drain-source-lines-a.patch + patches.kernel.org/5.2.11-123-Drivers-hv-vmbus-Fix-virt_to_hvpfn-for-X86_PAE.patch + patches.kernel.org/5.2.11-124-userfaultfd_release-always-remove-uffd-flags-a.patch + patches.kernel.org/5.2.11-125-x86-retpoline-Don-t-clobber-RFLAGS-during-CALL.patch + patches.kernel.org/5.2.11-126-x86-apic-Handle-missing-global-clockevent-grac.patch + patches.kernel.org/5.2.11-127-x86-CPU-AMD-Clear-RDRAND-CPUID-bit-on-AMD-fami.patch + patches.kernel.org/5.2.11-128-x86-boot-Save-fields-explicitly-zero-out-every.patch + patches.kernel.org/5.2.11-129-x86-boot-Fix-boot-regression-caused-by-bootpar.patch + patches.kernel.org/5.2.11-130-IB-hfi1-Unsafe-PSN-checking-for-TID-RDMA-READ-.patch + patches.kernel.org/5.2.11-131-IB-hfi1-Add-additional-checks-when-handling-TI.patch + patches.kernel.org/5.2.11-132-IB-hfi1-Add-additional-checks-when-handling-TI.patch + patches.kernel.org/5.2.11-133-IB-hfi1-Drop-stale-TID-RDMA-packets-that-cause.patch + patches.kernel.org/5.2.11-134-psi-get-poll_work-to-run-when-calling-poll-sys.patch + patches.kernel.org/5.2.11-135-dm-kcopyd-always-complete-failed-jobs.patch + patches.kernel.org/5.2.11-136-dm-dust-use-dust-block-size-for-badblocklist-i.patch + patches.kernel.org/5.2.11-137-dm-btree-fix-order-of-block-initialization-in-.patch + patches.kernel.org/5.2.11-138-dm-integrity-fix-a-crash-due-to-BUG_ON-in-__jo.patch + patches.kernel.org/5.2.11-139-dm-raid-add-missing-cleanup-in-raid_ctr.patch + patches.kernel.org/5.2.11-140-dm-space-map-metadata-fix-missing-store-of-app.patch + patches.kernel.org/5.2.11-141-dm-table-fix-invalid-memory-accesses-with-too-.patch + patches.kernel.org/5.2.11-142-dm-zoned-improve-error-handling-in-reclaim.patch + patches.kernel.org/5.2.11-143-dm-zoned-improve-error-handling-in-i-o-map-cod.patch + patches.kernel.org/5.2.11-144-dm-zoned-properly-handle-backing-device-failur.patch + patches.kernel.org/5.2.11-145-genirq-Properly-pair-kobject_del-with-kobject_.patch + patches.kernel.org/5.2.11-146-mm-z3fold.c-fix-race-between-migration-and-des.patch + patches.kernel.org/5.2.11-147-mm-page_alloc-move_freepages-should-not-examin.patch + patches.kernel.org/5.2.11-148-mm-memcontrol-flush-percpu-vmstats-before-rele.patch + patches.kernel.org/5.2.11-149-mm-memcontrol-flush-percpu-vmevents-before-rel.patch + patches.kernel.org/5.2.11-150-mm-page_owner-handle-THP-splits-correctly.patch + patches.kernel.org/5.2.11-151-mm-zsmalloc.c-migration-can-leave-pages-in-ZS_.patch + patches.kernel.org/5.2.11-152-mm-zsmalloc.c-fix-race-condition-in-zs_destroy.patch + patches.kernel.org/5.2.11-153-mm-kasan-fix-false-positive-invalid-free-repor.patch + patches.kernel.org/5.2.11-154-xfs-fix-missing-ILOCK-unlock-when-xfs_setattr_.patch + patches.kernel.org/5.2.11-155-IB-hfi1-Drop-stale-TID-RDMA-packets.patch + patches.kernel.org/5.2.11-156-dm-zoned-fix-potential-NULL-dereference-in-dmz.patch + patches.kernel.org/5.2.11-157-io_uring-fix-potential-hang-with-polled-IO.patch + patches.kernel.org/5.2.11-158-io_uring-don-t-enter-poll-loop-if-we-have-CQEs.patch + patches.kernel.org/5.2.11-159-io_uring-add-need_resched-check-in-inner-poll-.patch + patches.kernel.org/5.2.11-160-powerpc-Allow-flush_-inval_-dcache_range-to-wo.patch + patches.kernel.org/5.2.11-161-rxrpc-Fix-local-endpoint-refcounting.patch + patches.kernel.org/5.2.11-162-rxrpc-Fix-read-after-free-in-rxrpc_queue_local.patch + patches.kernel.org/5.2.11-163-rxrpc-Fix-local-endpoint-replacement.patch + patches.kernel.org/5.2.11-164-rxrpc-Fix-local-refcounting.patch + patches.kernel.org/5.2.11-165-Linux-5.2.11.patch ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -1377,7 +1542,6 @@ ######################################################## # x86_64/i386 biarch ######################################################## - patches.suse/x86-apic-Handle-missing-global-clockevent-gracefully.patch ######################################################## # x86 MCE/MCA (Machine Check Error/Architecture) extensions @@ -1574,6 +1738,10 @@ # Wireless Networking ######################################################## patches.suse/b43-missing-firmware-info.patch + patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch + patches.suse/net-ath10k-Fix-a-NULL-ptr-deref-bug.patch + patches.suse/net-ath6kl-Fix-a-NULL-ptr-deref-bug.patch + patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch ######################################################## # ISDN ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:31.353383123 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:31.357383123 +0200 @@ -1,3 +1,3 @@ -2019-08-25 17:33:34 +0000 -GIT Revision: 5878ee66182973951394c95f74851a1df456dd71 +2019-08-29 06:41:19 +0000 +GIT Revision: 638511006109a60917e424dc002a3599671ec2c0 GIT Branch: stable ++++++ split-modules ++++++ --- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:31.361383122 +0200 +++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:31.365383121 +0200 @@ -59,8 +59,8 @@ tmp=$(mktemp -d) mkdir "$tmp/empty" -find "$opt_dir" -type f -name '*.ko' -printf '/%P\n' | \ - awk -F/ '{ n=$NF; gsub(/-/, "_", n); sub(/\.ko$/, "", n); print n " " $0; }' | \ +find "$opt_dir" -type f \( -name '*.ko' -o -name '*.ko.xz' \) -printf '/%P\n' | \ + awk -F/ '{ n=$NF; gsub(/-/, "_", n); sub(/\.ko(\.xz)?$/, "", n); print n " " $0; }' | \ sort >"$tmp/all" err=false @@ -101,7 +101,7 @@ @for dep in $^; do echo "$$dep needed by $@"; done >> $(EXPLAIN) endif ' - sed -r 's:[^ ]*/([^/]*)\.ko\>:\1:g; y/-/_/' "$modules_dep" + sed -r 's:[^ ]*/([^/]*)\.ko(.xz)?\>:\1:g; y/-/_/' "$modules_dep" ) >"$tmp/dep" add_dependent_modules()