aboutsummaryrefslogtreecommitdiff
path: root/fs/cifs/cifsfs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-04-09 09:05:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-04-09 09:05:25 -0700
commit462e9a355e7488fde3712c3b2585fc2f2a2c263d (patch)
tree2f1cdf7e4b72281f9fba51b6d1515c2b46f8434b /fs/cifs/cifsfs.h
parent5b50be743f495b000891d430ecba7372cc59bb64 (diff)
parent3872fe83a2fbb7366daa93ca533a22138e2d483e (diff)
downloadlinux-stericsson-462e9a355e7488fde3712c3b2585fc2f2a2c263d.tar.gz
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "A number of ARM fixes: - prevent oopses caused by dma_get_sgtable() and declared DMA coherent memory - fix boot failure on nommu caused by ID_PFR1 access - a number of kprobes fixes from Jon Medhurst and Masami Hiramatsu" * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 8665/1: nommu: access ID_PFR1 only if CPUID scheme ARM: dma-mapping: disallow dma_get_sgtable() for non-kernel managed memory arm: kprobes: Align stack to 8-bytes in test code arm: kprobes: Fix the return address of multiple kretprobes arm: kprobes: Skip single-stepping in recursing path if possible arm: kprobes: Allow to handle reentered kprobe on single-stepping
Diffstat (limited to 'fs/cifs/cifsfs.h')
0 files changed, 0 insertions, 0 deletions