• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · db141796
    Linus Torvalds authored
    Pull s390 patches from Martin Schwidefsky:
     "The biggest patch is the rework of the smp code, something I wanted to
      do for some time.  There are some patches for our various dump methods
      and one new thing: z/VM LGR detection.  LGR stands for linux-guest-
      relocation and is the guest migration feature of z/VM.  For debugging
      purposes we keep a log of the systems where a specific guest has lived."
    
    Fix up trivial conflict in arch/s390/kernel/smp.c due to the scheduler
    cleanup having removed some code next to removed s390 code.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      [S390] kernel: Pass correct stack for smp_call_ipl_cpu()
      [S390] Ensure that vmcore_info pointer is never accessed directly
      [S390] dasd: prevent validate server for offline devices
      [S390] Remove monolithic build option for zcrypt driver.
      [S390] stack dump: fix indentation in output
      [S390] kernel: Add OS info memory interface
      [S390] Use block_sigmask()
      [S390] kernel: Add z/VM LGR detection
      [S390] irq: external interrupt code passing
      [S390] irq: set __ARCH_IRQ_EXIT_IRQS_DISABLED
      [S390] zfcpdump: Implement async sdias event processing
      [S390] Use copy_to_absolute_zero() instead of "stura/sturg"
      [S390] rework idle code
      [S390] rework smp code
      [S390] rename lowcore field
      [S390] Fix gcc 4.6.0 compile warning
    db141796
process.c 8.96 KB