summaryrefslogtreecommitdiffstats
path: root/fs/kernfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-21 22:55:12 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-21 22:55:12 +0200
commit6538d625215f29671864649336645dea19214135 (patch)
tree3914e31265be5bb231179954fe0ae4e86c7282e5 /fs/kernfs
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff)
parentpowerpc: irq work racing with timer interrupt can result in timer interrupt hang (diff)
downloadlinux-6538d625215f29671864649336645dea19214135.tar.xz
linux-6538d625215f29671864649336645dea19214135.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull two powerpc fixes from Ben Herrenschmidt: "Here are a couple of fixes for 3.15. One from Anton fixes a nasty regression I introduced when trying to fix a loss of irq_work whose consequences is that we can completely lose timer interrupts on a CPU... not pretty. The other one is a change to our PCIe reset hook to use a firmware call instead of direct config space accesses to trigger a fundamental reset on the root port. This is necessary so that the FW gets a chance to disable the link down error monitoring, which would otherwise trip and cause subsequent fatal EEH error" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: irq work racing with timer interrupt can result in timer interrupt hang powerpc/powernv: Reset root port in firmware
Diffstat (limited to 'fs/kernfs')
0 files changed, 0 insertions, 0 deletions