Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e9245c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:

 - a fix for the vfio ccw translation code

 - update an incorrect email address in the MAINTAINERS file

 - fix a division by zero oops in the cpum_sf code found by trinity

 - two fixes for the error handling of the qdio code

 - several spectre related patches to convert all left-over indirect
   branches in the kernel to expoline branches

 - update defconfigs to avoid warnings due to the netfilter Kconfig
   changes

 - avoid several compiler warnings in the kexec_file code for s390

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/qdio: don't release memory in qdio_setup_irq()
  s390/qdio: fix access to uninitialized qdio_q fields
  s390/cpum_sf: ensure sample frequency of perf event attributes is non-zero
  s390: use expoline thunks in the BPF JIT
  s390: extend expoline to BC instructions
  s390: remove indirect branch from do_softirq_own_stack
  s390: move spectre sysfs attribute code
  s390/kernel: use expoline for indirect branches
  s390/ftrace: use expoline for indirect branches
  s390/lib: use expoline for indirect branches
  s390/crc32-vx: use expoline for indirect branches
  s390: move expoline assembler macros to a header
  vfio: ccw: fix cleanup if cp_prefetch fails
  s390/kexec_file: add declaration of purgatory related globals
  s390: update defconfigs
  MAINTAINERS: update s390 zcrypt maintainers email address
parents 305bb552 2e68adcd

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -12220,7 +12220,7 @@ F: Documentation/s390/vfio-ccw.txt 
F:	include/uapi/linux/vfio_ccw.h



S390 ZCRYPT DRIVER

M:	Harald Freudenberger <freude@de.ibm.com>

M:	Harald Freudenberger <freude@linux.ibm.com>

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported

arch/s390/configs/debug_defconfig

+4 −5
Original line number Diff line number Diff line
@@ -261,9 +261,9 @@ CONFIG_IP_VS_NQ=m 
CONFIG_IP_VS_FTP=m

CONFIG_IP_VS_PE_SIP=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_TABLES_IPV4=m

CONFIG_NF_TABLES_IPV4=y

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m
@@ -284,7 +284,7 @@ CONFIG_IP_NF_ARPTABLES=m 
CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_TABLES_IPV6=m

CONFIG_NF_TABLES_IPV6=y

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_IP6_NF_IPTABLES=m
@@ -305,7 +305,7 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_SECURITY=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_RDS=m

CONFIG_RDS_RDMA=m

CONFIG_RDS_TCP=m
@@ -604,7 +604,6 @@ CONFIG_DETECT_HUNG_TASK=y 
CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DEBUG_TIMEKEEPING=y

CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_LOCKDEP=y

arch/s390/configs/performance_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -259,9 +259,9 @@ CONFIG_IP_VS_NQ=m 
CONFIG_IP_VS_FTP=m

CONFIG_IP_VS_PE_SIP=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_TABLES_IPV4=m

CONFIG_NF_TABLES_IPV4=y

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m
@@ -282,7 +282,7 @@ CONFIG_IP_NF_ARPTABLES=m 
CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_TABLES_IPV6=m

CONFIG_NF_TABLES_IPV6=y

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_IP6_NF_IPTABLES=m
@@ -303,7 +303,7 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_SECURITY=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_RDS=m

CONFIG_RDS_RDMA=m

CONFIG_RDS_TCP=m

arch/s390/crypto/crc32be-vx.S

+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <linux/linkage.h>

#include <asm/nospec-insn.h>

#include <asm/vx-insn.h>



/* Vector register range containing CRC-32 constants */
@@ -67,6 +68,8 @@ 


.previous



	GEN_BR_THUNK %r14



.text

/*

 * The CRC-32 function(s) use these calling conventions:
@@ -203,6 +206,6 @@ ENTRY(crc32_be_vgfm_16) 


.Ldone:

	VLGVF	%r2,%v2,3

	br	%r14

	BR_EX	%r14



.previous

arch/s390/crypto/crc32le-vx.S

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include <linux/linkage.h>

#include <asm/nospec-insn.h>

#include <asm/vx-insn.h>



/* Vector register range containing CRC-32 constants */
@@ -76,6 +77,7 @@ 


.previous



	GEN_BR_THUNK %r14



.text
@@ -264,6 +266,6 @@ crc32_le_vgfm_generic: 


.Ldone:

	VLGVF	%r2,%v2,2

	br	%r14

	BR_EX	%r14



.previous