• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 6c09931b
    Linus Torvalds authored
    Pull s390 updates from Martin Schwidefsky:
     "The main new feature is machine support for System zEC12 including
      transactional memory, runtime instrumentation, support for scm block
      devices via eadm subchannels, and support for CEX4 crypto cards.
    
      In addition there are some nice improvements: bpf jit compiler, arch
      backend for cmpxchg_double, relative exception table entries, dasd
      partition detection independent from the dasd driver ioctls, and cpu
      cache information in /proc/cpuinfo and /sys/device/cpu.
    
      And last but not least a series of cleanup patches from Heiko."
    
    Fix up trivial add-add conflict in arch/s390/Kconfig due to commit
    b952741c ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING")
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (76 commits)
      s390: update defconfig
      s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL
      s390/disassembler: fix decoding of risblg instruction
      s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction
      s390/traps: move call to print_modules() out of show_regs()
      s390/mm: mark free_initrd_mem() as __init
      s390/dasd: check count address during online setting
      drivers/s390/char/monreader.c: fix error return code
      s390/cmpxchg,percpu: implement cmpxchg_double()
      s390/percpu: implement this_cpu_add_return()
      s390/percpu: implement this_cpu_xchg()
      s390/kexec: remove CONFIG_KEXEC
      s390/irq: use designated initializers for irq class array
      s390: add uninitialized_var() to suppress false positive compiler warnings
      s390/crashdump: move fill_cpu_elf_notes() prototype to header file
      s390/process: add missing header include
      s390/ptrace: add missing ifdef
      s390/ipl,decrompressor: disable branch profiling
      s390/perf_events: compile only for CONFIG_64BIT
      s390/tape: remove even more tape block leftovers
      ...
    6c09931b
vtime.c 10.1 KB