diff options
Diffstat (limited to 'include/scsi/scsi_host.h')
| tree | 2fb686a4dea9a7f4beec97fde510f2840c8e06f9 /include/dt-bindings/interrupt-controller | |
|---|---|---|
| parent | ed40875dd4b4c7b5c991db9e06c984180ab0b3ce (diff) | |
| parent | be29d20f3f5db1f0b4e49a4f6eeedf840e2bf9b1 (diff) | |
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore:
"Two small fixes relating to audit's use of fsnotify.
The first patch plugs a leak and the second fixes some lock
shenanigans. The patches are small and I banged on this for an
afternoon with our testsuite and didn't see anything odd"
* 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit:
audit: Fix sleep in atomic
fsnotify: Remove fsnotify_duplicate_mark()
Diffstat (limited to 'include/dt-bindings/interrupt-controller')