Commit df24212a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Vasily Gorbik:

 - Convert to using the generic entry infrastructure.

 - Add vdso time namespace support.

 - Switch s390 and alpha to 64-bit ino_t. As discussed at

     https://lore.kernel.org/linux-mm/YCV7QiyoweJwvN+m@osiris/

 - Get rid of expensive stck (store clock) usages where possible.
   Utilize cpu alternatives to patch stckf when supported.

 - Make tod_clock usage less error prone by converting it to a union and
   rework code which is using it.

 - Machine check handler fixes and cleanups.

 - Drop couple of minor inline asm optimizations to fix clang build.

 - Default configs changes notably to make libvirt happy.

 - Various changes to rework and improve qdio code.

 - Other small various fixes and improvements all over the code.

* tag 's390-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (68 commits)
  s390/qdio: remove 'merge_pending' mechanism
  s390/qdio: improve handling of PENDING buffers for QEBSM devices
  s390/qdio: rework q->qdio_error indication
  s390/qdio: inline qdio_kick_handler()
  s390/time: remove get_tod_clock_ext()
  s390/crypto: use store_tod_clock_ext()
  s390/hypfs: use store_tod_clock_ext()
  s390/debug: use union tod_clock
  s390/kvm: use union tod_clock
  s390/vdso: use union tod_clock
  s390/time: convert tod_clock_base to union
  s390/time: introduce new store_tod_clock_ext()
  s390/time: rename store_tod_clock_ext() and use union tod_clock
  s390/time: introduce union tod_clock
  s390,alpha: switch to 64-bit ino_t
  s390: split cleanup_sie
  s390: use r13 in cleanup_sie as temp register
  s390: fix kernel asce loading when sie is interrupted
  s390: add stack for machine check handler
  s390: use WRITE_ONCE when re-allocating async stack
  ...
parents 3e105853 2223318c

Documentation/scsi/scsi-parameters.rst

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ parameters may be changed at runtime by the command 
			(/proc/sys/dev/scsi/logging_level).

			There is also a nice 'scsi_logging_level' script in the

			S390-tools package, available for download at

			https://github.com/ibm-s390-tools/s390-tools/blob/master/scripts/scsi_logging_level

			https://github.com/ibm-s390-linux/s390-tools/blob/master/scripts/scsi_logging_level



	scsi_mod.scan=	[SCSI] sync (default) scans SCSI busses as they are

			discovered.  async scans them in kernel threads,

Documentation/virt/kvm/s390-pv-boot.rst

+1 −1
Original line number Diff line number Diff line
@@ -80,5 +80,5 @@ Keys 
----

Every CEC will have a unique public key to enable tooling to build

encrypted images.

See  `s390-tools <https://github.com/ibm-s390-tools/s390-tools/>`_

See  `s390-tools <https://github.com/ibm-s390-linux/s390-tools/>`_

for the tooling.

arch/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,10 @@ config ARCH_32BIT_OFF_T 
	  still support 32-bit off_t. This option is enabled for all such

	  architectures explicitly.



# Selected by 64 bit architectures which have a 32 bit f_tinode in struct ustat

config ARCH_32BIT_USTAT_F_TINODE

	bool



config HAVE_ASM_MODVERSIONS

	bool

	help

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config ALPHA

	bool

	default y

	select ARCH_32BIT_USTAT_F_TINODE

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_NO_PREEMPT

arch/s390/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ config S390 
	# Note: keep this list sorted alphabetically

	#

	imply IMA_SECURE_AND_OR_TRUSTED_BOOT

	select ARCH_32BIT_USTAT_F_TINODE

	select ARCH_BINFMT_ELF_STATE

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEBUG_WX
@@ -123,11 +124,13 @@ config S390 
	select GENERIC_ALLOCATOR

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_VULNERABILITIES

	select GENERIC_ENTRY

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_GETTIMEOFDAY

	select GENERIC_PTDUMP

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select GENERIC_VDSO_TIME_NS

	select HAVE_ALIGNED_STRUCT_PAGE if SLUB

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_JUMP_LABEL