diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 17:51:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 17:51:37 -0800 |
| commit | 6d1dd93ea0d0f0fb61b5450a2668896028ce3f75 (patch) | |
| tree | a45ab8a949209c0cef6f00b0882e5f39bb5fcb4c /MAINTAINERS | |
| parent | 81bbef23db51c0b450d90607fbbc2ad80ee0d43f (diff) | |
| parent | fc1b326efd276e7d121f5c1ced2884ae52a85814 (diff) | |
Merge tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore updates from Kees Cook:
"Minor changes to pstore tree:
- update MAINTAINERS with current git repo, add more files.
- move prz allocation checks into the walker
- initialize flags correctly (by accident spinlock was technically
ok)"
* tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
MAINTAINERS: Adjust pstore git repo URI, add files
pstore: Check for prz allocation in walker
pstore: Correctly initialize spinlock and flags
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2f9f345a15b7..7099fe18cb47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9995,16 +9995,19 @@ S: Maintained F: drivers/block/ps3vram.c PSTORE FILESYSTEM +M: Kees Cook <keescook@chromium.org> M: Anton Vorontsov <anton@enomsg.org> M: Colin Cross <ccross@android.com> -M: Kees Cook <keescook@chromium.org> M: Tony Luck <tony.luck@intel.com> S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore F: fs/pstore/ F: include/linux/pstore* F: drivers/firmware/efi/efi-pstore.c F: drivers/acpi/apei/erst.c +F: Documentation/admin-guide/ramoops.rst +F: Documentation/devicetree/bindings/reserved-memory/ramoops.txt +K: \b(pstore|ramoops) PTP HARDWARE CLOCK SUPPORT M: Richard Cochran <richardcochran@gmail.com> |