https://github.com/torvalds/linux
Revision 3e9245c5fa3092de19b95f03817b02469bcf146c authored by Linus Torvalds on 17 May 2018, 17:11:44 UTC, committed by Linus Torvalds on 17 May 2018, 17:11:44 UTC
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
2 parent s 305bb55 + 2e68adc
History
Tip revision: 3e9245c5fa3092de19b95f03817b02469bcf146c authored by Linus Torvalds on 17 May 2018, 17:11:44 UTC
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Tip revision: 3e9245c
File Mode Size
Kconfig -rw-r--r-- 3.1 KB
Makefile -rw-r--r-- 402 bytes
acl.c -rw-r--r-- 8.9 KB
acl.h -rw-r--r-- 1.2 KB
checkpoint.c -rw-r--r-- 36.3 KB
data.c -rw-r--r-- 60.2 KB
debug.c -rw-r--r-- 17.2 KB
dir.c -rw-r--r-- 22.4 KB
extent_cache.c -rw-r--r-- 19.3 KB
f2fs.h -rw-r--r-- 101.8 KB
file.c -rw-r--r-- 70.1 KB
gc.c -rw-r--r-- 27.5 KB
gc.h -rw-r--r-- 3.1 KB
hash.c -rw-r--r-- 2.2 KB
inline.c -rw-r--r-- 15.9 KB
inode.c -rw-r--r-- 17.4 KB
namei.c -rw-r--r-- 28.3 KB
node.c -rw-r--r-- 68.5 KB
node.h -rw-r--r-- 12.1 KB
recovery.c -rw-r--r-- 16.5 KB
segment.c -rw-r--r-- 101.1 KB
segment.h -rw-r--r-- 25.6 KB
shrinker.c -rw-r--r-- 3.3 KB
super.c -rw-r--r-- 78.5 KB
sysfs.c -rw-r--r-- 18.4 KB
trace.c -rw-r--r-- 3.5 KB
trace.h -rw-r--r-- 1013 bytes
xattr.c -rw-r--r-- 17.2 KB
xattr.h -rw-r--r-- 4.7 KB

back to top