diff options
| author | Linus Torvalds | 2014-05-21 22:55:12 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-05-21 22:55:12 +0200 |
| commit | 6538d625215f29671864649336645dea19214135 (patch) | |
| tree | 3914e31265be5bb231179954fe0ae4e86c7282e5 /fs/nfsd/nfs4acl.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | powerpc: irq work racing with timer interrupt can result in timer interrupt hang (diff) | |
| download | kernel-qcow2-linux-6538d625215f29671864649336645dea19214135.tar.gz kernel-qcow2-linux-6538d625215f29671864649336645dea19214135.tar.xz kernel-qcow2-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/nfsd/nfs4acl.c')
0 files changed, 0 insertions, 0 deletions