Re: [GIT PULL] s390 patches for the 4.17 merge window #1

From: Martin Schwidefsky
Date: Mon Apr 09 2018 - 09:18:35 EST


Hi Linus,

On Tue, 3 Apr 2018 11:12:42 +0200
Martin Schwidefsky <schwidefsky@xxxxxxxxxx> wrote:

> please pull from the 'for-linus' branch of
>
> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
>
> to receive the following updates:
>
> * Improvements for the spectre defense:
> - The spectre related code is consolidated to a single file nospec-branch.c
> - Automatic enable/disable for the spectre v2 defenses (expoline vs. nobp)
> - Syslog messages for specve v2 are added
> - Enable CONFIG_GENERIC_CPU_VULNERABILITIES and define the attribute
> functions for spectre v1 and v2
>
> * Add helper macros for assembler alternatives and use them to shorten
> the code in entry.S.
>
> * Add support for persistent configuration data via the SCLP Store Data
> interface. The H/W interface requires a page table that uses 4K pages
> only, the code to setup such an address space is added as well.
>
> * Enable virtio GPU emulation in QEMU. To do this the depends statements
> for a few common Kconfig options are modified.
>
> * Add support for format-3 channel path descriptors and add a binary
> sysfs interface to export the associated utility strings.
>
> * Add a sysfs attribute to control the IFCC handling in case of constant
> channel errors.
>
> * The vfio-ccw changes from Cornelia.
>
> * Bug fixes and cleanups.
>
> There is a trivial merge conflict in drivers/video/console/Kconfig.

Ping.

Did this please-pull get lost or is there a deeper reason that prevents
the upstream integration?

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.