diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-30 01:05:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-30 01:05:18 +0100 |
| commit | 6b292a8abd8113410a25a179ac13a1a6e1c9d451 (patch) | |
| tree | 76315e0460fb4dbc94768f1460071404415b0726 /arch/powerpc/kernel/dma-swiotlb.c | |
| parent | Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | s390/cio: update measurement characteristics (diff) | |
| download | linux-6b292a8abd8113410a25a179ac13a1a6e1c9d451.tar.xz linux-6b292a8abd8113410a25a179ac13a1a6e1c9d451.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:
"An optimization for irq-restore, the SSM instruction is quite a bit
slower than an if-statement and a STOSM.
The copy_file_range system all is added.
Cleanup for PCI and CIO.
And a couple of bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/cio: update measurement characteristics
s390/cio: ensure consistent measurement state
s390/cio: fix measurement characteristics memleak
s390/zcrypt: Fix cryptographic device id in kernel messages
s390/pci: remove iomap sanity checks
s390/pci: set error state for unusable functions
s390/pci: fix bar check
s390/pci: resize iomap
s390/pci: improve ZPCI_* macros
s390/pci: provide ZPCI_ADDR macro
s390/pci: adjust IOMAP_MAX_ENTRIES
s390/numa: move numa_init_late() from device to arch_initcall
s390: remove all usages of PSW_ADDR_INSN
s390: remove all usages of PSW_ADDR_AMODE
s390: wire up copy_file_range syscall
s390: remove superfluous memblock_alloc() return value checks
s390/numa: allocate memory with correct alignment
s390/irqflags: optimize irq restore
s390/mm: use TASK_MAX_SIZE where applicable
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions