Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2018-06-15 15:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Fri Jun 15 15:26:14 2018 rev:435 rq:616723 version:4.17.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2018-06-13 15:51:06.406744685 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2018-06-15 15:26:23.664421052 +0200 @@ -1,0 +2,557 @@ +Thu Jun 14 08:23:34 CEST 2018 - [email protected] + +- config.conf: disable syzkaller + I doubt anybody else (other than me) uses the flavor, so save a lot of + build resources by this. Leaving syzkaller configs and stuff in place + so people still can build it if they want. + The build is currently broken, so this "fixes" it too: + ERROR: "__sanitizer_cov_trace_cmpd" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! + ERROR: "__sanitizer_cov_trace_cmpf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! +- commit bdee95f + +------------------------------------------------------------------- +Tue Jun 12 11:38:53 CEST 2018 - [email protected] + +- Linux 4.17.1 (bnc#1012628). +- netfilter: nf_flow_table: attach dst to skbs (bnc#1012628). +- bnx2x: use the right constant (bnc#1012628). +- ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table + succeeds (bnc#1012628). +- ipv6: omit traffic class when calculating flow hash (bnc#1012628 + bsc#1095042). +- l2tp: fix refcount leakage on PPPoL2TP sockets (bnc#1012628). +- netdev-FAQ: clarify DaveM's position for stable backports + (bnc#1012628). +- net: metrics: add proper netlink validation (bnc#1012628). +- net/packet: refine check for priv area size (bnc#1012628). +- rtnetlink: validate attributes in do_setlink() (bnc#1012628). +- sctp: not allow transport timeout value less than HZ/5 for + hb_timer (bnc#1012628). +- team: use netdev_features_t instead of u32 (bnc#1012628). +- vrf: check the original netdevice for generating redirect + (bnc#1012628). +- net: dsa: b53: Fix for brcm tag issue in Cygnus SoC + (bnc#1012628). +- ipmr: fix error path when ipmr_new_table fails (bnc#1012628). +- PCI: hv: Do not wait forever on a device that has disappeared + (bnc#1012628). +- Delete + patches.suse/ipv6-omit-traffic-class-when-calculating-flow-hash.patch. +- commit 17c8abe + +------------------------------------------------------------------- +Fri Jun 8 15:42:50 CEST 2018 - [email protected] + +- mtd: spi-nor: intel-spi: Fix atomic sequence handling + (bsc#1073836). +- commit c31c53d + +------------------------------------------------------------------- +Fri Jun 8 11:42:06 CEST 2018 - [email protected] + +- ipv6: omit traffic class when calculating flow hash + (bsc#1095042). +- commit 1307c29 + +------------------------------------------------------------------- +Fri Jun 8 10:11:35 CEST 2018 - [email protected] + +- Delete patches.suse/iwlwifi-expose-default-fallback-ucode-api. + The workaround is no longer needed as the upstream driver code catches + up the actual firmware version +- commit d6e069d + +------------------------------------------------------------------- +Fri Jun 8 10:09:38 CEST 2018 - [email protected] + +- Update patch tag of the upstreamed btusb fix +- commit f531f64 + +------------------------------------------------------------------- +Mon Jun 4 13:06:56 CEST 2018 - [email protected] + +- config: enable preemption in i386/debug +- commit b181e22 + +------------------------------------------------------------------- +Mon Jun 4 06:35:34 CEST 2018 - [email protected] + +- Update to 4.17-final +- commit fb45ad0 + +------------------------------------------------------------------- +Sat Jun 2 21:10:35 CEST 2018 - [email protected] + +- packet: fix reserve calculation (bsc#1095592). +- commit f670a16 + +------------------------------------------------------------------- +Fri Jun 1 19:37:49 CEST 2018 - [email protected] + +- xfs: enhance dinode verifier (bsc#1090749,CVE-2018-10322). +- commit d565016 + +------------------------------------------------------------------- +Thu May 31 07:56:10 CEST 2018 - [email protected] + +- Linux 4.16.13 (bnc#1012628). +- drm/vmwgfx: Set dmabuf_size when vmw_dmabuf_init is successful + (bnc#1012628). +- kdb: make "mdr" command repeat (bnc#1012628). +- pinctrl: mcp23s08: spi: Fix regmap debugfs entries + (bnc#1012628). +- pinctrl: msm: Use dynamic GPIO numbering (bnc#1012628). +- regulator: of: Add a missing 'of_node_put()' in an error + handling path of 'of_regulator_match()' (bnc#1012628). +- ARM: dts: porter: Fix HDMI output routing (bnc#1012628). +- ARM: dts: imx7d: cl-som-imx7: fix pinctrl_enet (bnc#1012628). +- i40e: Add delay after EMP reset for firmware to recover + (bnc#1012628). +- soc: amlogic: meson-gx-pwrc-vpu: fix error on shutdown when + domain is powered off (bnc#1012628). +- regmap: Correct comparison in regmap_cached (bnc#1012628). +- ARM: dts: at91: tse850: use the correct compatible for the + eeprom (bnc#1012628). +- ARM: dts: at91: nattis: use the correct compatible for the + eeprom (bnc#1012628). +- selftests: Add FIB onlink tests (bnc#1012628). +- drm: rcar-du: lvds: Fix LVDS startup on R-Car Gen2 + (bnc#1012628). +- drm: rcar-du: lvds: Fix LVDS startup on R-Car Gen3 + (bnc#1012628). +- netlabel: If PF_INET6, check sk_buff ip header version + (bnc#1012628). +- drm/vblank: Data type fixes for 64-bit vblank sequences + (bnc#1012628). +- selftests/net: fixes psock_fanout eBPF test case (bnc#1012628). +- perf tests: Fix dwarf unwind for stripped binaries + (bnc#1012628). +- perf report: Fix memory corruption in --branch-history mode + --branch-history (bnc#1012628). +- perf tests: Use arch__compare_symbol_names to compare symbols + (bnc#1012628). +- perf report: Fix wrong jump arrow (bnc#1012628). +- perf test: Fix test case inet_pton to accept inlines + (bnc#1012628). +- x86/apic: Set up through-local-APIC mode on the boot CPU if + 'noapic' specified (bnc#1012628). +- drm/rockchip: Respect page offset for PRIME mmap calls + (bnc#1012628). +- soc: renesas: r8a77970-sysc: fix power area parents + (bnc#1012628). +- MIPS: Octeon: Fix logging messages with spurious periods after + newlines (bnc#1012628). +- dpaa_eth: fix pause capability advertisement logic + (bnc#1012628). +- drm/amd/display: Set vsc pack revision when DPCD revision is >= + 1.2 (bnc#1012628). +- dt-bindings: display: msm/dsi: Fix the PHY regulator supply + props (bnc#1012628). +- pinctrl: sh-pfc: r8a7796: Fix MOD_SEL register pin assignment + for SSI pins group (bnc#1012628). +- rcu: Call touch_nmi_watchdog() while printing stall warnings + (bnc#1012628). +- net: stmmac: call correct function in + stmmac_mac_config_rx_queues_routing() (bnc#1012628). +- audit: return on memory error to avoid null pointer dereference + (bnc#1012628). +- hwrng: bcm2835 - Handle deferred clock properly (bnc#1012628). +- PCMCIA / PM: Avoid noirq suspend aborts during suspend-to-idle + (bnc#1012628). +- ARM: dts: bcm283x: Fix pin function of JTAG pins (bnc#1012628). +- ARM: dts: bcm283x: Fix probing of bcm2835-i2s (bnc#1012628). +- power: supply: ltc2941-battery-gauge: Fix temperature units + (bnc#1012628). +- sh_eth: fix TSU init on SH7734/R8A7740 (bnc#1012628). +- ixgbe: prevent ptp_rx_hang from running when in FILTER_ALL mode + (bnc#1012628). +- udf: Provide saner default for invalid uid / gid (bnc#1012628). +- PCI: Add function 1 DMA alias quirk for Marvell 88SE9220 + (bnc#1012628). +- dpaa_eth: fix SG mapping (bnc#1012628). +- cpufreq: Reorder cpufreq_online() error code path (bnc#1012628). +- net: stmmac: ensure that the MSS desc is the last desc to set + the own bit (bnc#1012628). +- net: stmmac: ensure that the device has released ownership + before reading data (bnc#1012628). +- ibmvnic: Allocate statistics buffers during probe (bnc#1012628). +- drm/amdgpu: adjust timeout for ib_ring_tests(v2) (bnc#1012628). +- drm/amdgpu: disable GFX ring and disable PQ wptr in hw_fini + (bnc#1012628). +- ARM: dts: dra71-evm: Correct evm_sd regulator max voltage + (bnc#1012628). +- drm: omapdrm: dss: Move initialization code from component + bind to probe (bnc#1012628). +- dmaengine: qcom: bam_dma: get num-channels and num-ees from dt + (bnc#1012628). +- vfio-ccw: fence off transport mode (bnc#1012628). +- pinctrl: artpec6: dt: add missing pin group uart5nocts + (bnc#1012628). +- pinctrl: devicetree: Fix dt_to_map_one_config handling of hogs + (bnc#1012628). +- hwrng: stm32 - add reset during probe (bnc#1012628). +- watchdog: asm9260_wdt: fix error handling in asm9260_wdt_probe() + (bnc#1012628). +- enic: enable rq before updating rq descriptors (bnc#1012628). +- dmaengine: rcar-dmac: Check the done lists in + rcar_dmac_chan_get_residue() (bnc#1012628). ++++ 579 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.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: ---- kernel-syzkaller.changes kernel-syzkaller.spec linux-4.16.tar.xz New: ---- linux-4.17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:43.719687341 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:43.767685586 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %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}) Name: dtb-aarch64 -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:44.591655441 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:44.623654270 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 # END COMMON DEPS -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1094,8 +1094,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %obsolete_rebuilds %name-base %ifarch %ix86 ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.023639637 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.047638759 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 # END COMMON DEPS -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -1100,8 +1100,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %ifarch ppc64 Provides: kernel-kdump-base = 2.6.28 ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.167634369 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.199633198 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 # END COMMON DEPS -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -1143,8 +1143,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %ifarch %ix86 Provides: kernel-trace-base = 3.13 ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.283630126 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.291629833 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.319628809 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.323628662 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0 Group: System/Kernel -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 # END COMMON DEPS -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1098,8 +1098,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %obsolete_rebuilds %name-base %ifarch %ix86 kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.375626760 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.379626613 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.16.12 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +BuildRequires: kernel%kernel_flavor-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %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: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.403625735 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.407625589 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.16.12 +%define patchversion 4.17.1 %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: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.431624711 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.439624418 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 # END COMMON DEPS -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -1120,8 +1120,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %ifarch %ix86 Provides: kernel-vmi-base = 2.6.38 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.463623541 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.467623394 +0200 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.491622516 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.495622370 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.16.12 +Version: 4.17.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -55,7 +55,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.519621492 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.527621199 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.16 -%define patchversion 4.16.12 +%define srcversion 4.17 +%define patchversion 4.17.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 4.16.12 +Version: 4.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.g39c7522 +Release: <RELEASE>.gdf028bb %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 # END COMMON DEPS -Provides: %name-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: %name-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1091,8 +1091,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a -Provides: kernel-srchash = 39c752265b891e209d4fdfb390d8ae77fbfc430a +Provides: kernel-%build_flavor-base-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 +Provides: kernel-srchash = df028bb6256ccfc5c84e775e6b437d77ed9cf148 %obsolete_rebuilds %name-base %ifarch %ix86 kernel-zfcpdump.spec: same change ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.711614468 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.711614468 +0200 @@ -8,7 +8,6 @@ <package>kernel-kvmsmall</package> <package>kernel-lpae</package> <package>kernel-pae</package> -<package>kernel-syzkaller</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> </conditions> @@ -60,7 +59,6 @@ <package>kernel-kvmsmall</package> <package>kernel-lpae</package> <package>kernel-pae</package> -<package>kernel-syzkaller</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> </conditions> @@ -82,7 +80,6 @@ <package>kernel-kvmsmall</package> <package>kernel-lpae</package> <package>kernel-pae</package> -<package>kernel-syzkaller</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> </conditions> @@ -103,7 +100,6 @@ <package>kernel-kvmsmall</package> <package>kernel-lpae</package> <package>kernel-pae</package> -<package>kernel-syzkaller</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> </conditions> @@ -124,7 +120,6 @@ <package>kernel-kvmsmall</package> <package>kernel-lpae</package> <package>kernel-pae</package> -<package>kernel-syzkaller</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> </conditions> ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.827610224 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.831610078 +0200 @@ -15,7 +15,7 @@ +x86_64 x86_64/default +x86_64 -syms x86_64/debug -+x86_64 -syms x86_64/syzkaller +- x86_64/syzkaller +x86_64 x86_64/vanilla +x86_64 -syms x86_64/kvmsmall ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:45.855609200 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:45.855609200 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=4.16 +SRCVERSION=4.17 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 10940 lines of diff (skipped) ++++++ linux-4.16.tar.xz -> linux-4.17.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-4.16.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.17.tar.xz differ: char 15, line 1 ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 89722 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-cifs-smb2ops-Fix-listxattr-when-there-are-no-EAs.patch new/patches.suse/0001-cifs-smb2ops-Fix-listxattr-when-there-are-no-EAs.patch --- old/patches.suse/0001-cifs-smb2ops-Fix-listxattr-when-there-are-no-EAs.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/0001-cifs-smb2ops-Fix-listxattr-when-there-are-no-EAs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -From ae2cd7fb478b8da707906ee1706ae1379968a8f9 Mon Sep 17 00:00:00 2001 -From: Paulo Alcantara <[email protected]> -Date: Fri, 4 May 2018 11:25:26 -0300 -Subject: [PATCH] cifs: smb2ops: Fix listxattr() when there are no EAs -Git-commit: ae2cd7fb478b8da707906ee1706ae1379968a8f9 -Patch-mainline: v4.17 -References: bsc#1091442 - -As per listxattr(2): - - On success, a nonnegative number is returned indicating the size - of the extended attribute name list. On failure, -1 is returned - and errno is set appropriately. - -In SMB1, when the server returns an empty EA list through a listxattr(), -it will correctly return 0 as there are no EAs for the given file. - -However, in SMB2+, it returns -ENODATA in listxattr() which is wrong since -the request and response were sent successfully, although there's no actual -EA for the given file. - -This patch fixes listxattr() for SMB2+ by returning 0 in cifs_listxattr() -when the server returns an empty list of EAs. - -Signed-off-by: Paulo Alcantara <[email protected]> -Reviewed-by: Aurelien Aptel <[email protected]> -Signed-off-by: Steve French <[email protected]> -Signed-off-by: Paulo Alcantara <[email protected]> ---- - fs/cifs/smb2ops.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c -index b76b85881dcc..9c6d95ffca97 100644 ---- a/fs/cifs/smb2ops.c -+++ b/fs/cifs/smb2ops.c -@@ -589,9 +589,15 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, - - SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid); - -+ /* -+ * If ea_name is NULL (listxattr) and there are no EAs, return 0 as it's -+ * not an error. Otherwise, the specified ea_name was not found. -+ */ - if (!rc) - rc = move_smb2_ea_to_cifs(ea_data, buf_size, smb2_data, - SMB2_MAX_EA_BUF, ea_name); -+ else if (!ea_name && rc == -ENODATA) -+ rc = 0; - - kfree(smb2_data); - return rc; --- -2.13.6 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch new/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch --- old/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch 2018-06-12 11:38:53.000000000 +0200 @@ -22,17 +22,17 @@ Signed-off-by: KarimAllah Ahmed <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- - Documentation/admin-guide/kernel-parameters.txt | 1 - arch/x86/include/asm/cpufeatures.h | 1 - arch/x86/include/asm/nospec-branch.h | 2 - - arch/x86/kernel/cpu/bugs.c | 35 ++++++++++++++++++------ - arch/x86/lib/Makefile | 2 - - arch/x86/lib/retpoline.S | 5 +++ + .../admin-guide/kernel-parameters.txt | 1 + + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/nospec-branch.h | 2 -- + arch/x86/kernel/cpu/bugs.c | 35 ++++++++++++++----- + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/retpoline.S | 5 +++ 6 files changed, 35 insertions(+), 11 deletions(-) --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3996,6 +3996,7 @@ +@@ -4024,6 +4024,7 @@ retpoline - replace indirect branches retpoline,generic - google's original retpoline retpoline,amd - AMD-specific minimal thunk @@ -46,7 +46,7 @@ #define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */ #define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */ #define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 (Zen) */ -+#define X86_FEATURE_USE_IBRS ( 7*32+23) /* "" Use IBRS for Spectre v2 safety */ ++#define X86_FEATURE_USE_IBRS ( 7*32+29) /* "" Use IBRS for Spectre v2 safety */ /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */ @@ -78,7 +78,7 @@ }; static const char *spectre_v2_strings[] = { -@@ -129,6 +130,7 @@ static const char *spectre_v2_strings[] +@@ -129,6 +130,7 @@ static const char *spectre_v2_strings[] = { [SPECTRE_V2_RETPOLINE_MINIMAL_AMD] = "Vulnerable: Minimal AMD ASM retpoline", [SPECTRE_V2_RETPOLINE_GENERIC] = "Mitigation: Full generic retpoline", [SPECTRE_V2_RETPOLINE_AMD] = "Mitigation: Full AMD retpoline", @@ -94,7 +94,7 @@ { "auto", SPECTRE_V2_CMD_AUTO, false }, }; -@@ -311,7 +314,7 @@ static enum spectre_v2_mitigation_cmd __ +@@ -311,7 +314,7 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void) return cmd; } @@ -103,7 +103,7 @@ static bool __init is_skylake_era(void) { if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && -@@ -345,19 +348,34 @@ static void __init spectre_v2_select_mit +@@ -345,19 +348,34 @@ static void __init spectre_v2_select_mitigation(void) case SPECTRE_V2_CMD_NONE: return; @@ -143,7 +143,7 @@ case SPECTRE_V2_CMD_RETPOLINE: if (IS_ENABLED(CONFIG_RETPOLINE)) goto retpoline_auto; -@@ -384,6 +402,7 @@ retpoline_auto: +@@ -384,6 +402,7 @@ static void __init spectre_v2_select_mitigation(void) setup_force_cpu_cap(X86_FEATURE_RETPOLINE); } @@ -151,7 +151,7 @@ spectre_v2_enabled = mode; pr_info("%s\n", spectre_v2_strings[mode]); -@@ -399,8 +418,8 @@ retpoline_auto: +@@ -399,8 +418,8 @@ static void __init spectre_v2_select_mitigation(void) * or deactivated in favour of retpolines the RSB fill on context * switch is required. */ @@ -164,7 +164,7 @@ } --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile -@@ -27,7 +27,7 @@ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += +@@ -27,7 +27,7 @@ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch new/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch --- old/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch 2018-06-12 11:38:53.000000000 +0200 @@ -23,14 +23,14 @@ Signed-off-by: David Woodhouse <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- - arch/x86/include/asm/nospec-branch.h | 36 +++++++++++++++++++++++++++++++++++ + arch/x86/include/asm/nospec-branch.h | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h -@@ -265,6 +265,42 @@ static inline void indirect_branch_predi - alternative_msr_write(MSR_IA32_PRED_CMD, val, X86_FEATURE_USE_IBPB); - } +@@ -292,6 +292,42 @@ do { \ + preempt_enable(); \ + } while (0) +/* + * This also performs a barrier, and setting it again when it was already @@ -68,6 +68,6 @@ + : "memory"); +} + - /* The Intel SPEC CTRL MSR base value cache */ - extern u64 x86_spec_ctrl_base; + #endif /* __ASSEMBLY__ */ + /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Bluetooth-Apply-QCA-Rome-patches-for-some-ATH3021-modules new/patches.suse/Bluetooth-Apply-QCA-Rome-patches-for-some-ATH3021-modules --- old/patches.suse/Bluetooth-Apply-QCA-Rome-patches-for-some-ATH3021-modules 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/Bluetooth-Apply-QCA-Rome-patches-for-some-ATH3021-modules 2018-06-12 11:38:53.000000000 +0200 @@ -1,8 +1,9 @@ +From 803cdb8ce584198cd45825822910cac7de6378cb Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> -Subject: [PATCH] Bluetooth: Apply QCA Rome patches for some ATH3012 models Date: Mon, 21 May 2018 22:34:52 +0200 -Message-id: <[email protected]> -Patch-mainline: Submitted, linux-bluetooth ML +Subject: [PATCH] Bluetooth: btusb: Apply QCA Rome patches for some ATH3012 models +Git-commit: 803cdb8ce584198cd45825822910cac7de6378cb +Patch-mainline: v4.18-rc1 References: bsc#1082504 In commit f44cb4b19ed4 ("Bluetooth: btusb: Fix quirk for Atheros @@ -37,16 +38,17 @@ Bugzilla: http://bugzilla.opensuse.org/show_bug.cgi?id=1082504 Tested-by: Ivan Levshin <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> +Signed-off-by: Marcel Holtmann <[email protected]> --- drivers/bluetooth/btusb.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index b937cc1e2c07..9a91f44ee33b 100644 +index 292b1ea066ca..84de6244ae66 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -2497,11 +2497,9 @@ static const struct qca_device_info qca_devices_table[] = { +@@ -2502,11 +2502,9 @@ static const struct qca_device_info qca_devices_table[] = { { 0x00000302, 28, 4, 18 }, /* Rome 3.2 */ }; @@ -59,7 +61,7 @@ int pipe, err; u8 *buf; -@@ -2516,7 +2514,7 @@ static int btusb_qca_send_vendor_req(struct hci_dev *hdev, u8 request, +@@ -2521,7 +2519,7 @@ static int btusb_qca_send_vendor_req(struct hci_dev *hdev, u8 request, err = usb_control_msg(udev, pipe, request, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, buf, size, USB_CTRL_SET_TIMEOUT); if (err < 0) { @@ -68,7 +70,7 @@ goto done; } -@@ -2666,20 +2664,38 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, +@@ -2671,20 +2669,38 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, return err; } @@ -108,7 +110,7 @@ for (i = 0; i < ARRAY_SIZE(qca_devices_table); i++) { if (ver_rom == qca_devices_table[i].rom_version) info = &qca_devices_table[i]; -@@ -2689,7 +2705,7 @@ static int btusb_setup_qca(struct hci_dev *hdev) +@@ -2694,7 +2710,7 @@ static int btusb_setup_qca(struct hci_dev *hdev) return -ENODEV; } @@ -117,7 +119,7 @@ sizeof(status)); if (err < 0) return err; -@@ -2903,7 +2919,8 @@ static int btusb_probe(struct usb_interface *intf, +@@ -2908,7 +2924,8 @@ static int btusb_probe(struct usb_interface *intf, /* Old firmware would otherwise let ath3k driver load * patch and sysconfig files */ @@ -127,7 +129,7 @@ return -ENODEV; } -@@ -3065,6 +3082,7 @@ static int btusb_probe(struct usb_interface *intf, +@@ -3070,6 +3087,7 @@ static int btusb_probe(struct usb_interface *intf, } if (id->driver_info & BTUSB_ATH3012) { @@ -136,5 +138,5 @@ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); -- -2.16.3 +2.17.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/brcmsmac-allocate-ucode-with-GFP_KERNEL.patch new/patches.suse/brcmsmac-allocate-ucode-with-GFP_KERNEL.patch --- old/patches.suse/brcmsmac-allocate-ucode-with-GFP_KERNEL.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/brcmsmac-allocate-ucode-with-GFP_KERNEL.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -From: Takashi Iwai <[email protected]> -Subject: [PATCH] brcmsmac: allocate ucode with GFP_KERNEL -Date: Fri, 16 Mar 2018 16:41:49 +0100 -Message-id: <[email protected]> -Patch-mainline: Submitted, linux-wireless ML -References: bsc#1085174 - -The brcms_ucode_init_buf() duplicates the ucode chunks via kmemdup() -with GFP_ATOMIC as a precondition of wl->lock acquired. This caused -allocation failures sometimes as reported in the bugzilla below. - -When looking at the the real usage, one can find that it's called -solely from brcms_request_fw(), and it's obviously outside the lock. -Hence we can use GFP_KERNEL there safely for avoiding such allocation -errors. - -Bugzilla: http://bugzilla.suse.com/show_bug.cgi?id=1085174 -Signed-off-by: Takashi Iwai <[email protected]> -Acked-by: Arend van Spriel <[email protected]> - ---- - drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c -@@ -1563,7 +1563,7 @@ void brcms_free_timer(struct brcms_timer - } - - /* -- * precondition: perimeter lock has been acquired -+ * precondition: no locking required - */ - int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx) - { -@@ -1578,7 +1578,7 @@ int brcms_ucode_init_buf(struct brcms_in - if (le32_to_cpu(hdr->idx) == idx) { - pdata = wl->fw.fw_bin[i]->data + - le32_to_cpu(hdr->offset); -- *pbuf = kmemdup(pdata, len, GFP_ATOMIC); -+ *pbuf = kmemdup(pdata, len, GFP_KERNEL); - if (*pbuf == NULL) - goto fail; - 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 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch 2018-06-12 11:38:53.000000000 +0200 @@ -22,13 +22,13 @@ Signed-off-by: Luis R. Rodriguez <[email protected]> --- - fs/super.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++- - include/linux/fs.h | 20 ++++++++++++++++++ + fs/super.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++- + include/linux/fs.h | 20 +++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) --- a/fs/super.c +++ b/fs/super.c -@@ -137,6 +137,59 @@ static unsigned long super_cache_count(s +@@ -138,6 +138,59 @@ static unsigned long super_cache_count(struct shrinker *shrink, return total_objects; } @@ -88,7 +88,7 @@ static void destroy_super_work(struct work_struct *work) { struct super_block *s = container_of(work, struct super_block, -@@ -164,6 +217,7 @@ static void destroy_unused_super(struct +@@ -165,6 +218,7 @@ static void destroy_unused_super(struct super_block *s) list_lru_destroy(&s->s_dentry_lru); list_lru_destroy(&s->s_inode_lru); security_sb_free(s); @@ -96,7 +96,7 @@ put_user_ns(s->s_user_ns); kfree(s->s_subtype); free_prealloced_shrinker(&s->s_shrink); -@@ -232,6 +286,7 @@ static struct super_block *alloc_super(s +@@ -233,6 +287,7 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags, spin_lock_init(&s->s_inode_list_lock); INIT_LIST_HEAD(&s->s_inodes_wb); spin_lock_init(&s->s_inode_wblist_lock); @@ -104,7 +104,7 @@ if (list_lru_init_memcg(&s->s_dentry_lru)) goto fail; -@@ -779,7 +834,7 @@ rescan: +@@ -802,7 +857,7 @@ struct super_block *user_get_super(dev_t dev) list_for_each_entry(sb, &super_blocks, s_list) { if (hlist_unhashed(&sb->s_instances)) continue; @@ -115,7 +115,7 @@ down_read(&sb->s_umount); --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1340,6 +1340,14 @@ struct sb_writers { +@@ -1342,6 +1342,14 @@ struct sb_writers { struct percpu_rw_semaphore rw_sem[SB_FREEZE_LEVELS]; }; @@ -130,7 +130,7 @@ struct super_block { struct list_head s_list; /* Keep this first */ dev_t s_dev; /* search index; _not_ kdev_t */ -@@ -1366,6 +1374,7 @@ struct super_block { +@@ -1368,6 +1376,7 @@ struct super_block { const struct fscrypt_operations *s_cop; struct hlist_bl_head s_roots; /* alternate root dentries for NFS */ @@ -138,7 +138,7 @@ struct list_head s_mounts; /* list of mounts; _not_ for fs use */ struct block_device *s_bdev; struct backing_dev_info *s_bdi; -@@ -2129,6 +2138,17 @@ void deactivate_locked_super(struct supe +@@ -2132,6 +2141,17 @@ void deactivate_locked_super(struct super_block *sb); int set_anon_super(struct super_block *s, void *data); 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/crasher.patch new/patches.suse/crasher.patch --- old/patches.suse/crasher.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/crasher.patch 2018-06-12 11:38:53.000000000 +0200 @@ -21,14 +21,15 @@ Signed-off-by: Jiri Slaby <[email protected]> --- - drivers/char/Kconfig | 6 + - drivers/char/Makefile | 1 - drivers/char/crasher.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++ + drivers/char/Kconfig | 6 ++ + drivers/char/Makefile | 1 + + drivers/char/crasher.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 242 insertions(+) + create mode 100644 drivers/char/crasher.c --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -575,6 +575,12 @@ config DEVPORT +@@ -538,6 +538,12 @@ config DEVPORT source "drivers/s390/char/Kconfig" @@ -38,12 +39,12 @@ + help + Slab cache memory tester and crasher on will. + - config TILE_SROM - tristate "Character-device access via hypervisor to the Tilera SPI ROM" - depends on TILE + source "drivers/char/xillybus/Kconfig" + + endmenu --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -51,6 +51,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ +@@ -49,6 +49,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o obj-$(CONFIG_TCG_TPM) += tpm/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/iwlwifi-expose-default-fallback-ucode-api new/patches.suse/iwlwifi-expose-default-fallback-ucode-api --- old/patches.suse/iwlwifi-expose-default-fallback-ucode-api 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/iwlwifi-expose-default-fallback-ucode-api 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -From: Takashi Iwai <[email protected]> -Subject: iwlwifi: Expose the default fallback ucode API to module info -Patch-mainline: No, a tentative fix until firmware files are prepared -References: boo#1021082, boo#1023884 - -The upstream iwlwifi driver sets the max ucode API versions to some -non-exist firmware files, and this results in the broken WiFi in initrd -or in installation image because they are built with the information -given by modinfo. - -So far, the upstream doesn't take any action to it, so we need to paper -over it temporarily by manually adding the MODULE_FIRMWARE() entries. - -Signed-off-by: Takashi Iwai <[email protected]> ---- - drivers/net/wireless/intel/iwlwifi/cfg/7000.c | 9 +++++++++ - drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 4 ++++ - 2 files changed, 13 insertions(+) - ---- a/drivers/net/wireless/intel/iwlwifi/cfg/7000.c -+++ b/drivers/net/wireless/intel/iwlwifi/cfg/7000.c -@@ -72,9 +72,13 @@ - - /* Highest firmware API version supported */ - #define IWL7260_UCODE_API_MAX 17 -+#define IWL7260_UCODE_API_DEFAULT_FALLBACK 17 - #define IWL7265_UCODE_API_MAX 17 -+#define IWL7265_UCODE_API_DEFAULT_FALLBACK 17 - #define IWL7265D_UCODE_API_MAX 29 -+#define IWL7265D_UCODE_API_DEFAULT_FALLBACK 27 - #define IWL3168_UCODE_API_MAX 29 -+#define IWL3168_UCODE_API_DEFAULT_FALLBACK 27 - - /* Lowest firmware API version supported */ - #define IWL7260_UCODE_API_MIN 17 -@@ -382,3 +386,8 @@ MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE( - MODULE_FIRMWARE(IWL3168_MODULE_FIRMWARE(IWL3168_UCODE_API_MAX)); - MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7265_UCODE_API_MAX)); - MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7265D_UCODE_API_MAX)); -+MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_DEFAULT_FALLBACK)); -+MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_DEFAULT_FALLBACK)); -+MODULE_FIRMWARE(IWL3168_MODULE_FIRMWARE(IWL3168_UCODE_API_DEFAULT_FALLBACK)); -+MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7265_UCODE_API_DEFAULT_FALLBACK)); -+MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7265D_UCODE_API_DEFAULT_FALLBACK)); ---- a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c -+++ b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c -@@ -71,7 +71,9 @@ - - /* Highest firmware API version supported */ - #define IWL8000_UCODE_API_MAX 36 -+#define IWL8000_UCODE_API_DEFAULT_FALLBACK 27 - #define IWL8265_UCODE_API_MAX 36 -+#define IWL8265_UCODE_API_DEFAULT_FALLBACK 27 - - /* Lowest firmware API version supported */ - #define IWL8000_UCODE_API_MIN 22 -@@ -278,3 +280,5 @@ const struct iwl_cfg iwl4165_2ac_sdio_cf - - MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_MAX)); - MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_MAX)); -+MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_DEFAULT_FALLBACK)); -+MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_DEFAULT_FALLBACK)); 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 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch 2018-06-12 11:38:53.000000000 +0200 @@ -36,18 +36,19 @@ Signed-off-by: Jeff Mahoney <[email protected]> --- - Makefile | 11 +++++ - init/Kconfig.suse | 70 ++++++++++++++++++++++++++++++++++++ - kernel/printk/printk.c | 5 +- - scripts/gen-suse_version_h.sh | 81 ++++++++++++++++++++++++++++++++++++++++++ - scripts/mod/modpost.c | 10 +++++ + Makefile | 11 +++++- + init/Kconfig.suse | 70 +++++++++++++++++++++++++++++++++++++ + lib/dump_stack.c | 5 +-- + scripts/gen-suse_version_h.sh | 81 +++++++++++++++++++++++++++++++++++++++++++ + scripts/mod/modpost.c | 10 ++++++ 5 files changed, 174 insertions(+), 3 deletions(-) + create mode 100644 scripts/gen-suse_version_h.sh --- a/Makefile +++ b/Makefile -@@ -1035,6 +1035,15 @@ endef - include/config/kernel.release: include/config/auto.conf FORCE - $(call filechk,kernel.release) +@@ -978,6 +978,15 @@ ifdef CONFIG_STACK_VALIDATION + endif + endif +suse_version_h := include/generated/uapi/linux/suse_version.h + @@ -59,12 +60,12 @@ + $(call filechk,suse_version) + - # Things we need to do before we recursively start building the kernel - # or the modules are listed in "prepare". -@@ -1064,7 +1073,7 @@ endif + ifeq ($(KBUILD_EXTMOD),) + core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ +@@ -1108,7 +1117,7 @@ endif prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic - prepare1: prepare2 $(version_h) include/generated/utsrelease.h \ + prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h \ - include/config/auto.conf + include/config/auto.conf $(suse_version_h) $(cmd_crmodverdir) @@ -153,24 +154,26 @@ say n. +endmenu ---- a/kernel/printk/printk.c -+++ b/kernel/printk/printk.c -@@ -48,6 +48,7 @@ - #include <linux/sched/clock.h> - #include <linux/sched/debug.h> - #include <linux/sched/task_stack.h> +--- a/lib/dump_stack.c ++++ b/lib/dump_stack.c +@@ -12,6 +12,7 @@ + #include <linux/atomic.h> + #include <linux/kexec.h> + #include <linux/utsname.h> +#include <linux/suse_version.h> - #include <linux/uaccess.h> - #include <asm/sections.h> -@@ -3272,11 +3273,11 @@ void __init dump_stack_set_arch_desc(con + static char dump_stack_arch_desc_str[128]; + +@@ -44,13 +45,13 @@ void __init dump_stack_set_arch_desc(const char *fmt, ...) */ void dump_stack_print_info(const char *log_lvl) { -- printk("%sCPU: %d PID: %d Comm: %.20s %s %s %.*s\n", -+ printk("%sCPU: %d PID: %d Comm: %.20s %s %s %.*s %s\n", +- printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s\n", ++ printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s %s\n", log_lvl, raw_smp_processor_id(), current->pid, current->comm, - print_tainted(), init_utsname()->release, + kexec_crash_loaded() ? "Kdump: loaded " : "", + print_tainted(), + init_utsname()->release, (int)strcspn(init_utsname()->version, " "), - init_utsname()->version); + init_utsname()->version, SUSE_PRODUCT_SHORTNAME); @@ -271,7 +274,7 @@ /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; -@@ -2373,6 +2374,14 @@ static void add_srcversion(struct buffer +@@ -2386,6 +2387,14 @@ static void add_srcversion(struct buffer *b, struct module *mod) } } @@ -286,7 +289,7 @@ static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2632,6 +2641,7 @@ int main(int argc, char **argv) +@@ -2646,6 +2655,7 @@ int main(int argc, char **argv) add_depends(&buf, mod, modules); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/kernel-add-release-status-to-kernel-build.patch new/patches.suse/kernel-add-release-status-to-kernel-build.patch --- old/patches.suse/kernel-add-release-status-to-kernel-build.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/kernel-add-release-status-to-kernel-build.patch 2018-06-12 11:38:53.000000000 +0200 @@ -12,9 +12,9 @@ Signed-off-by: Jeff Mahoney <[email protected]> --- - init/Kconfig.suse | 6 ++++++ - kernel/ksysfs.c | 4 ++++ - kernel/printk/printk.c | 10 ++++++++-- + init/Kconfig.suse | 6 ++++++ + kernel/ksysfs.c | 4 ++++ + lib/dump_stack.c | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) --- a/init/Kconfig.suse @@ -40,7 +40,7 @@ int mask = (1 << TAINT_PROPRIETARY_MODULE) | (1 << TAINT_NO_SUPPORT); if ((taint & mask) == mask) return "No, Proprietary and Unsupported modules are loaded"; -@@ -224,6 +225,9 @@ const char *supported_printable(int tain +@@ -224,6 +225,9 @@ const char *supported_printable(int taint) return "Yes, External"; else return "Yes"; @@ -50,16 +50,18 @@ } static ssize_t supported_show(struct kobject *kobj, ---- a/kernel/printk/printk.c -+++ b/kernel/printk/printk.c -@@ -3273,11 +3273,17 @@ void __init dump_stack_set_arch_desc(con +--- a/lib/dump_stack.c ++++ b/lib/dump_stack.c +@@ -44,13 +44,19 @@ void __init dump_stack_set_arch_desc(const char *fmt, ...) */ void dump_stack_print_info(const char *log_lvl) { -- printk("%sCPU: %d PID: %d Comm: %.20s %s %s %.*s %s\n", -+ printk("%sCPU: %d PID: %d Comm: %.20s %s %s %.*s %s%s\n", +- printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s %s\n", ++ printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s %s%s\n", log_lvl, raw_smp_processor_id(), current->pid, current->comm, - print_tainted(), init_utsname()->release, + kexec_crash_loaded() ? "Kdump: loaded " : "", + print_tainted(), + init_utsname()->release, (int)strcspn(init_utsname()->version, " "), - init_utsname()->version, SUSE_PRODUCT_SHORTNAME); + init_utsname()->version, SUSE_PRODUCT_SHORTNAME, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mtd-spi-nor-intel-spi-Fix-atomic-sequence-handling new/patches.suse/mtd-spi-nor-intel-spi-Fix-atomic-sequence-handling --- old/patches.suse/mtd-spi-nor-intel-spi-Fix-atomic-sequence-handling 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/mtd-spi-nor-intel-spi-Fix-atomic-sequence-handling 2018-06-12 11:38:53.000000000 +0200 @@ -0,0 +1,205 @@ +From c7d6a82d90e193b1e4daba957e3908f26306d491 Mon Sep 17 00:00:00 2001 +From: Mika Westerberg <[email protected]> +Date: Mon, 5 Feb 2018 14:32:59 +0300 +Subject: [PATCH] mtd: spi-nor: intel-spi: Fix atomic sequence handling +Git-commit: c7d6a82d90e193b1e4daba957e3908f26306d491 +Git-repo: git://git.infradead.org/linux-mtd.git +Patch-mainline: Queued in subsystem maintainer repo +References: bsc#1073836 + +On many older systems using SW sequencer the PREOP_OPTYPE register +contains two preopcodes as following: + + PREOP_OPTYPE=0xf2785006 + +The last two bytes are the opcodes decoded to: + + 0x50 - Write enable for volatile status register + 0x06 - Write enable + +The former is used to modify volatile bits in the status register. For +non-volatile bits the latter is needed. Preopcodes are used in SW +sequencer to send one command "atomically" without anything else +interfering the transfer. The sequence that gets executed is: + + - Send preopcode (write enable) from PREOP_OPTYPE register + - Send the actual SPI command + - Poll busy bit in the status register (0x05, RDSR) + +Commit 8c473dd61bb5 ("spi-nor: intel-spi: Don't assume OPMENU0/1 to be +programmed by BIOS") enabled atomic sequence handling but because both +preopcodes are programmed, the following happens: + + if (preop >> 8) + val |= SSFSTS_CTL_SPOP; + +Since on these systems preop >> 8 == 0x50 we end up picking volatile +write enable instead. Because of this the actual write command is pretty +much NOP unless there is a WREN latched in the chip already. + +Furthermore we should not really just assume that WREN was issued in +previous call to intel_spi_write_reg() because that might not be the +case. + +This updates driver to first check that the opcode is actually available +in PREOP_OPTYPE register and if not return error back to the spi-nor +core (if the controller is not locked we program it now). In addition we +save the opcode to ispi->atomic_preopcode field which is checked in next +call to intel_spi_sw_cycle() to actually enable atomic sequence using +the requested preopcode. + +Fixes: 8c473dd61bb5 ("spi-nor: intel-spi: Don't assume OPMENU0/1 to be programmed by BIOS") +Signed-off-by: Mika Westerberg <[email protected]> +Cc: [email protected] +Reviewed-by: Marek Vasut <[email protected]> +Signed-off-by: Boris Brezillon <[email protected]> +Acked-by: Takashi Iwai <[email protected]> + +--- + drivers/mtd/spi-nor/intel-spi.c | 76 +++++++++++++++++++++++++++++++++++----- + 1 file changed, 67 insertions(+), 9 deletions(-) + +--- a/drivers/mtd/spi-nor/intel-spi.c ++++ b/drivers/mtd/spi-nor/intel-spi.c +@@ -136,6 +136,7 @@ + * @swseq_reg: Use SW sequencer in register reads/writes + * @swseq_erase: Use SW sequencer in erase operation + * @erase_64k: 64k erase supported ++ * @atomic_preopcode: Holds preopcode when atomic sequence is requested + * @opcodes: Opcodes which are supported. This are programmed by BIOS + * before it locks down the controller. + */ +@@ -153,6 +154,7 @@ struct intel_spi { + bool swseq_reg; + bool swseq_erase; + bool erase_64k; ++ u8 atomic_preopcode; + u8 opcodes[8]; + }; + +@@ -474,7 +476,7 @@ static int intel_spi_sw_cycle(struct int + int optype) + { + u32 val = 0, status; +- u16 preop; ++ u8 atomic_preopcode; + int ret; + + ret = intel_spi_opcode_index(ispi, opcode, optype); +@@ -484,17 +486,42 @@ static int intel_spi_sw_cycle(struct int + if (len > INTEL_SPI_FIFO_SZ) + return -EINVAL; + ++ /* ++ * Always clear it after each SW sequencer operation regardless ++ * of whether it is successful or not. ++ */ ++ atomic_preopcode = ispi->atomic_preopcode; ++ ispi->atomic_preopcode = 0; ++ + /* Only mark 'Data Cycle' bit when there is data to be transferred */ + if (len > 0) + val = ((len - 1) << SSFSTS_CTL_DBC_SHIFT) | SSFSTS_CTL_DS; + val |= ret << SSFSTS_CTL_COP_SHIFT; + val |= SSFSTS_CTL_FCERR | SSFSTS_CTL_FDONE; + val |= SSFSTS_CTL_SCGO; +- preop = readw(ispi->sregs + PREOP_OPTYPE); +- if (preop) { +- val |= SSFSTS_CTL_ACS; +- if (preop >> 8) +- val |= SSFSTS_CTL_SPOP; ++ if (atomic_preopcode) { ++ u16 preop; ++ ++ switch (optype) { ++ case OPTYPE_WRITE_NO_ADDR: ++ case OPTYPE_WRITE_WITH_ADDR: ++ /* Pick matching preopcode for the atomic sequence */ ++ preop = readw(ispi->sregs + PREOP_OPTYPE); ++ if ((preop & 0xff) == atomic_preopcode) ++ ; /* Do nothing */ ++ else if ((preop >> 8) == atomic_preopcode) ++ val |= SSFSTS_CTL_SPOP; ++ else ++ return -EINVAL; ++ ++ /* Enable atomic sequence */ ++ val |= SSFSTS_CTL_ACS; ++ break; ++ ++ default: ++ return -EINVAL; ++ } ++ + } + writel(val, ispi->sregs + SSFSTS_CTL); + +@@ -538,13 +565,31 @@ static int intel_spi_write_reg(struct sp + + /* + * This is handled with atomic operation and preop code in Intel +- * controller so skip it here now. If the controller is not locked, +- * program the opcode to the PREOP register for later use. ++ * controller so we only verify that it is available. If the ++ * controller is not locked, program the opcode to the PREOP ++ * register for later use. ++ * ++ * When hardware sequencer is used there is no need to program ++ * any opcodes (it handles them automatically as part of a command). + */ + if (opcode == SPINOR_OP_WREN) { +- if (!ispi->locked) ++ u16 preop; ++ ++ if (!ispi->swseq_reg) ++ return 0; ++ ++ preop = readw(ispi->sregs + PREOP_OPTYPE); ++ if ((preop & 0xff) != opcode && (preop >> 8) != opcode) { ++ if (ispi->locked) ++ return -EINVAL; + writel(opcode, ispi->sregs + PREOP_OPTYPE); ++ } + ++ /* ++ * This enables atomic sequence on next SW sycle. Will ++ * be cleared after next operation. ++ */ ++ ispi->atomic_preopcode = opcode; + return 0; + } + +@@ -569,6 +614,13 @@ static ssize_t intel_spi_read(struct spi + u32 val, status; + ssize_t ret; + ++ /* ++ * Atomic sequence is not expected with HW sequencer reads. Make ++ * sure it is cleared regardless. ++ */ ++ if (WARN_ON_ONCE(ispi->atomic_preopcode)) ++ ispi->atomic_preopcode = 0; ++ + switch (nor->read_opcode) { + case SPINOR_OP_READ: + case SPINOR_OP_READ_FAST: +@@ -627,6 +679,9 @@ static ssize_t intel_spi_write(struct sp + u32 val, status; + ssize_t ret; + ++ /* Not needed with HW sequencer write, make sure it is cleared */ ++ ispi->atomic_preopcode = 0; ++ + while (len > 0) { + block_size = min_t(size_t, len, INTEL_SPI_FIFO_SZ); + +@@ -707,6 +762,9 @@ static int intel_spi_erase(struct spi_no + return 0; + } + ++ /* Not needed with HW sequencer erase, make sure it is cleared */ ++ ispi->atomic_preopcode = 0; ++ + while (len > 0) { + writel(offs, ispi->base + FADDR); + 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 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/supported-flag 2018-06-12 11:38:53.000000000 +0200 @@ -28,7 +28,7 @@ --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4311,6 +4311,14 @@ +@@ -4355,6 +4355,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -45,12 +45,12 @@ (default -1 = authorized except for wireless USB, --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt -@@ -975,6 +975,18 @@ can be ORed together: - signature. - 16384 - A soft lockup has previously occurred on the system. - 32768 - The kernel has been live patched. -+ 0x40000000 - An unsupported kernel module was loaded. -+ 0x80000000 - An kernel module with external support was loaded. +@@ -992,6 +992,18 @@ ORed together. The letters are seen in "Tainted" line of Oops reports. + 32768 (K): The kernel has been live patched. + 65536 (X): Auxiliary taint, defined and used by for distros. + 131072 (T): The kernel was built with the struct randomization plugin. ++0x40000000 (N): An unsupported kernel module was loaded. ++0x80000000 (X): An kernel module with external support was loaded. + +============================================================== + @@ -66,8 +66,8 @@ --- a/Makefile +++ b/Makefile -@@ -426,6 +426,11 @@ KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds +@@ -432,6 +432,11 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds + LDFLAGS := GCC_PLUGINS_CFLAGS := +# Warn about unsupported modules in kernels built inside Autobuild @@ -77,10 +77,10 @@ + export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES - export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE + export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -487,6 +487,9 @@ extern int panic_on_unrecovered_nmi; +@@ -498,6 +498,9 @@ extern int panic_on_unrecovered_nmi; extern int panic_on_io_nmi; extern int panic_on_warn; extern int sysctl_panic_on_rcu_stall; @@ -92,7 +92,7 @@ extern bool crash_kexec_post_notifiers; --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -496,6 +496,9 @@ bool is_module_address(unsigned long add +@@ -502,6 +502,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); @@ -127,7 +127,7 @@ + --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c -@@ -210,6 +210,30 @@ static struct bin_attribute notes_attr _ +@@ -210,6 +210,30 @@ static struct bin_attribute notes_attr __ro_after_init = { struct kobject *kernel_kobj; EXPORT_SYMBOL_GPL(kernel_kobj); @@ -158,16 +158,16 @@ static struct attribute * kernel_attrs[] = { &fscaps_attr.attr, &uevent_seqnum_attr.attr, -@@ -231,6 +255,9 @@ static struct attribute * kernel_attrs[] +@@ -230,6 +254,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 @@ -88,6 +88,22 @@ @@ -193,7 +193,7 @@ /* * Mutex protects: * 1) List of modules (also safely readable with preempt_disable), -@@ -1178,6 +1194,12 @@ static size_t module_flags_taint(struct +@@ -1178,6 +1194,12 @@ static size_t module_flags_taint(struct module *mod, char *buf) buf[l++] = taint_flags[i].c_true; } @@ -206,7 +206,7 @@ return l; } -@@ -1247,6 +1269,33 @@ static ssize_t show_taint(struct module_ +@@ -1247,6 +1269,33 @@ static ssize_t show_taint(struct module_attribute *mattr, static struct module_attribute modinfo_taint = __ATTR(taint, 0444, show_taint, NULL); @@ -240,7 +240,7 @@ static struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, -@@ -1255,6 +1304,9 @@ static struct module_attribute *modinfo_ +@@ -1255,6 +1304,9 @@ static struct module_attribute *modinfo_attrs[] = { &modinfo_coresize, &modinfo_initsize, &modinfo_taint, @@ -250,7 +250,7 @@ #ifdef CONFIG_MODULE_UNLOAD &modinfo_refcnt, #endif -@@ -1816,9 +1868,34 @@ static int mod_sysfs_setup(struct module +@@ -1816,9 +1868,34 @@ static int mod_sysfs_setup(struct module *mod, add_sect_attrs(mod, info); add_notes_attrs(mod, info); @@ -285,7 +285,7 @@ out_unreg_modinfo_attrs: module_remove_modinfo_attrs(mod); out_unreg_param: -@@ -4369,6 +4446,9 @@ void print_modules(void) +@@ -4370,6 +4447,9 @@ void print_modules(void) if (last_unloaded_module[0]) pr_cont(" [last unloaded: %s]", last_unloaded_module); pr_cont("\n"); @@ -297,7 +297,7 @@ #ifdef CONFIG_MODVERSIONS --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -791,6 +791,15 @@ static struct ctl_table kern_table[] = { +@@ -804,6 +804,15 @@ static struct ctl_table kern_table[] = { .extra1 = &pid_max_min, .extra2 = &pid_max_max, }, @@ -315,7 +315,7 @@ .data = &panic_on_oops, --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost -@@ -79,7 +79,11 @@ modpost = scripts/mod/modpost +@@ -79,7 +79,11 @@ modpost = scripts/mod/modpost \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ @@ -330,7 +330,7 @@ --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1941,6 +1941,50 @@ static char *remove_dot(char *s) +@@ -1940,6 +1940,50 @@ static char *remove_dot(char *s) return s; } @@ -381,7 +381,7 @@ static void read_symbols(char *modname) { const char *symname; -@@ -2181,6 +2225,15 @@ static void add_staging_flag(struct buff +@@ -2180,6 +2224,15 @@ static void add_staging_flag(struct buffer *b, const char *name) buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n"); } @@ -397,7 +397,7 @@ /** * Record CRCs for unresolved symbols **/ -@@ -2328,6 +2381,15 @@ static void write_if_changed(struct buff +@@ -2327,6 +2380,15 @@ static void write_if_changed(struct buffer *b, const char *fname) fclose(file); } @@ -413,7 +413,7 @@ /* parse Module.symvers file. line format: * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something] **/ -@@ -2424,12 +2486,15 @@ int main(int argc, char **argv) +@@ -2423,12 +2485,15 @@ int main(int argc, char **argv) struct buffer buf = { }; char *kernel_read = NULL, *module_read = NULL; char *dump_write = NULL, *files_source = NULL; @@ -430,7 +430,7 @@ switch (opt) { case 'i': kernel_read = optarg; -@@ -2473,11 +2538,20 @@ int main(int argc, char **argv) +@@ -2472,11 +2537,20 @@ int main(int argc, char **argv) case 'E': sec_mismatch_fatal = 1; break; @@ -451,7 +451,7 @@ if (kernel_read) read_dump(kernel_read, 1); if (module_read) -@@ -2516,6 +2590,9 @@ int main(int argc, char **argv) +@@ -2515,6 +2589,9 @@ int main(int argc, char **argv) add_intree_flag(&buf, !external_module); add_retpoline(&buf); add_staging_flag(&buf, mod->name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/suse-hv-guest-os-id.patch new/patches.suse/suse-hv-guest-os-id.patch --- old/patches.suse/suse-hv-guest-os-id.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/suse-hv-guest-os-id.patch 2018-06-12 11:38:53.000000000 +0200 @@ -9,22 +9,21 @@ A better change is pending. Acked-by: Olaf Hering <[email protected]> ---- - arch/x86/hyperv/hv_init.c | 4 +++- + arch/x86/hyperv/hv_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c -@@ -113,6 +113,8 @@ void hyperv_init(void) - { +@@ -248,6 +248,8 @@ void hyperv_init(void) u64 guest_id, required_msrs; union hv_x64_msr_hypercall_contents hypercall_msr; + int cpuhp; + __u8 d1 = 0x10; /* SuSE */ + __u16 d2 = 0x0; /* -d of a.b.c-d */ if (x86_hyper_type != X86_HYPER_MS_HYPERV) return; -@@ -122,7 +124,7 @@ void hyperv_init(void) +@@ -282,7 +284,7 @@ void hyperv_init(void) * 1. Register the guest ID * 2. Enable the hypercall and register the hypercall page */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch new/patches.suse/xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch --- old/patches.suse/xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch 2018-05-24 17:24:46.000000000 +0200 +++ new/patches.suse/xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -From 2c4306f719b083d17df2963bc761777576b8ad1b Mon Sep 17 00:00:00 2001 -From: Eric Sandeen <[email protected]> -Date: Mon, 16 Apr 2018 23:07:27 -0700 -Subject: [PATCH] xfs: set format back to extents if xfs_bmap_extents_to_btree -Git-commit: 2c4306f719b083d17df2963bc761777576b8ad1b -Patch-mainline: Queued in subsystem maintainer repository -Git-repo: git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs-4.17-fixes -References: bsc#1090717, CVE-2018-10323 - -If xfs_bmap_extents_to_btree fails in a mode where we call -xfs_iroot_realloc(-1) to de-allocate the root, set the -format back to extents. - -Otherwise we can assume we can dereference ifp->if_broot -based on the XFS_DINODE_FMT_BTREE format, and crash. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199423 -Signed-off-by: Eric Sandeen <[email protected]> -Reviewed-by: Christoph Hellwig <[email protected]> -Reviewed-by: Darrick J. Wong <[email protected]> -Signed-off-by: Darrick J. Wong <[email protected]> -Signed-off-by: Luis R. Rodriguez <[email protected]> ---- - fs/xfs/libxfs/xfs_bmap.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c -index 6a7c2f03ea11..040eeda8426f 100644 ---- a/fs/xfs/libxfs/xfs_bmap.c -+++ b/fs/xfs/libxfs/xfs_bmap.c -@@ -725,12 +725,16 @@ xfs_bmap_extents_to_btree( - *logflagsp = 0; - if ((error = xfs_alloc_vextent(&args))) { - xfs_iroot_realloc(ip, -1, whichfork); -+ ASSERT(ifp->if_broot == NULL); -+ XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS); - xfs_btree_del_cursor(cur, XFS_BTREE_ERROR); - return error; - } - - if (WARN_ON_ONCE(args.fsbno == NULLFSBLOCK)) { - xfs_iroot_realloc(ip, -1, whichfork); -+ ASSERT(ifp->if_broot == NULL); -+ XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS); - xfs_btree_del_cursor(cur, XFS_BTREE_ERROR); - return -ENOSPC; - } --- -2.16.3 - ++++++ series.conf ++++++ ++++ 1076 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.4SBJ1e/_old 2018-06-15 15:26:47.583545984 +0200 +++ /var/tmp/diff_new_pack.4SBJ1e/_new 2018-06-15 15:26:47.583545984 +0200 @@ -1,3 +1,3 @@ -2018-05-25 20:40:19 +0200 -GIT Revision: 39c752265b891e209d4fdfb390d8ae77fbfc430a +2018-06-14 08:39:01 +0200 +GIT Revision: df028bb6256ccfc5c84e775e6b437d77ed9cf148 GIT Branch: stable
