Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 81ec44a6
    Linus Torvalds authored
    Pull s390 update from Martin Schwidefsky:
     "The most prominent change in this patch set is the software dirty bit
      patch for s390.  It removes __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY and
      the page_test_and_clear_dirty primitive which makes the common memory
      management code a bit less obscure.
    
      Heiko fixed most of the PCI related fallout, more often than not
      missing GENERIC_HARDIRQS dependencies.  Notable is one of the 3270
      patches which adds an export to tty_io to be able to resize a tty.
    
      The rest is the usual bunch of cleanups and bug fixes."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
      s390/module: Add missing R_390_NONE relocation type
      drivers/gpio: add missing GENERIC_HARDIRQ dependency
      drivers/input: add couple of missing GENERIC_HARDIRQS dependencies
      s390/cleanup: rename SPP to LPP
      s390/mm: implement software dirty bits
      s390/mm: Fix crst upgrade of mmap with MAP_FIXED
      s390/linker skript: discard exit.data at runtime
      drivers/media: add missing GENERIC_HARDIRQS dependency
      s390/bpf,jit: add vlan tag support
      drivers/net,AT91RM9200: add missing GENERIC_HARDIRQS dependency
      iucv: fix kernel panic at reboot
      s390/Kconfig: sort list of arch selected config options
      phylib: remove !S390 dependeny from Kconfig
      uio: remove !S390 dependency from Kconfig
      dasd: fix sysfs cleanup in dasd_generic_remove
      s390/pci: fix hotplug module init
      s390/pci: cleanup clp page allocation
      s390/pci: cleanup clp inline assembly
      s390/perf: cpum_cf: fallback to software sampling events
      s390/mm: provide PAGE_SHARED define
      ...
    81ec44a6