summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_drm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-24 19:31:34 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-24 19:31:34 +0300
commite1dbc5a41051d4791160727829903ec5169c7152 (patch)
tree730ed06c0e1abe339a0f452d0c858c61d8226287 /drivers/gpu/drm/nouveau/nouveau_drm.c
parent40c431a5a5c2333079c67b03de6c0470e8306374 (diff)
parent4ec84835900b6eceb5b49f9ffeec9a0916ba43d6 (diff)
downloadlinux-e1dbc5a41051d4791160727829903ec5169c7152.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky: - A couple of patches for the zcrypt driver: + Add two masks to determine which AP cards and queues are host devices, this will be useful for KVM AP device passthrough + Add-on patch to improve the parsing of the new apmask and aqmask + Some code beautification - Second try to reenable the GCC plugins, the first patch set had a patch to do this but the merge somehow missed this - Remove the s390 specific GCC version check and use the generic one - Three patches for kdump, two bug fixes and one cleanup - Three patches for the PCI layer, one bug fix and two cleanups * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: remove gcc version check (4.3 or newer) s390/zcrypt: hex string mask improvements for apmask and aqmask. s390/zcrypt: AP bus support for alternate driver(s) s390/zcrypt: code beautify s390/zcrypt: switch return type to bool for ap_instructions_available() s390/kdump: Remove kzalloc_panic s390/kdump: Fix memleak in nt_vmcoreinfo s390/kdump: Make elfcorehdr size calculation ABI compliant s390/pci: remove fmb address from debug output s390/pci: remove stale rc s390/pci: fix out of bounds access during irq setup s390/zcrypt: fix ap_instructions_available() returncodes s390: reenable gcc plugins for real
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
0 files changed, 0 insertions, 0 deletions