summaryrefslogtreecommitdiffstats
path: root/net/tipc/zone.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-22 05:55:12 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-22 05:55:12 +0900
commit6538d625215f29671864649336645dea19214135 (patch)
tree3914e31265be5bb231179954fe0ae4e86c7282e5 /net/tipc/zone.h
parent11da37b26301be772c289c5406aec347ad140bd6 (diff)
parent8050936caf125fbe54111ba5e696b68a360556ba (diff)
downloadop-kernel-dev-6538d625215f29671864649336645dea19214135.zip
op-kernel-dev-6538d625215f29671864649336645dea19214135.tar.gz
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 'net/tipc/zone.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud