diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-12 10:34:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-12 10:34:20 -0800 |
| commit | a971526e4db7992362e938e53e2deb57e847ecc9 (patch) | |
| tree | 4ad2426b163d29335d21e8d43cfc7df601332740 /fs/exofs/inode.c | |
| parent | 7807563183c4c1bec1bcc815e8bcc40d807c81b7 (diff) | |
| parent | 78c0cbffebe60e1182c8f077de2c06a1a48dc5ae (diff) | |
Merge branch 'parisc-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"Fix the boot crash on Mako machines with Huge Pages, prevent a panic
with SATA controllers (and others) by correctly calculating the IOMMU
space, hook up the mlock2 syscall and drop unneeded code in the parisc
pci code"
* 'parisc-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Disable huge pages on Mako machines
parisc: Wire up mlock2 syscall
parisc: Remove unused pcibios_init_bus()
parisc iommu: fix panic due to trying to allocate too large region
Diffstat (limited to 'fs/exofs/inode.c')
0 files changed, 0 insertions, 0 deletions