summaryrefslogtreecommitdiffstats
path: root/fs/afs/flock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-20 10:27:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-20 10:27:39 -0800
commit697ed8d03909140d95484d46d277a4e46d89b0e5 (patch)
treede8364a8e821af3da70e709f1de9470a9fbdd8c6 /fs/afs/flock.c
parent77079b133f242d3e3710c9b89ed54458307e54ff (diff)
parent2a3811068fbc6bf09bb09d166b65394b091c1085 (diff)
downloadop-kernel-dev-697ed8d03909140d95484d46d277a4e46d89b0e5.zip
op-kernel-dev-697ed8d03909140d95484d46d277a4e46d89b0e5.tar.gz
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "A few more ARM fixes: - the assembly backtrace code suffers problems with the new printk() implementation which assumes that kernel messages without KERN_CONT should have newlines inserted between them. Fix this. - fix a section naming error - ".init.text" rather than ".text.init" - preallocate DMA debug memory at core_initcall() time rather than fs_initcall(), as we have some core drivers that need to use DMA mapping - and that triggers a kernel warning from the DMA debug code. - fix XIP kernels after the ro_after_init changes made this data permanently read-only" * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: Fix XIP kernels ARM: 8628/1: dma-mapping: preallocate DMA-debug hash tables in core_initcall ARM: 8624/1: proc-v7m.S: fix init section name ARM: fix backtrace
Diffstat (limited to 'fs/afs/flock.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud