diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-09 22:27:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-09 22:27:08 -0500 |
| commit | 9878f60240f786286ebfaa8ff9227ef38da1720c (patch) | |
| tree | b39c6b130ae03f217307f2cd3eb5e7659514a5e4 | |
| parent | b66a8043d0baa9818a407ed857eada5cb21cd9bb (diff) | |
| parent | 3e5d6897176d38b54124da56183810abbd68c8bc (diff) | |
Merge branch 'ena-bug-fixes'
Netanel Belgazal says:
====================
Bug Fixes in ENA driver
Changes from V3:
* Rebase patchset to master and solve merge conflicts.
* Remove redundant bug fix (fix error handling when probe fails)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"Fix a crash in the ARM-Exynos clocksource driver, triggered by CPU
hotplug operations"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/exynos_mct: Clear interrupt when cpu is shut down
Diffstat (limited to 'fs/9p/vfs_addr.c')