diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-04 00:44:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-04 00:44:29 +0300 |
| commit | 1726aa70e7e2f8967d60b4f836723b61f97db73e (patch) | |
| tree | 0f516117fb85498cc89c08142f98305bcec25cae /fs/ext4/fsmap.c | |
| parent | c80c238a28b8a3b2f35898e9a49d9516f7d54346 (diff) | |
| parent | e2598077dc6a26c9644393e5c21f22a90dbdccdb (diff) | |
| download | linux-1726aa70e7e2f8967d60b4f836723b61f97db73e.tar.xz | |
Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull integrity fixes from James Morris:
- add James Bottommley as a Trusted Keys maintainer.
- IMA: re-initialize iint->atomic_flags on iint_free(), from Mimi.
* 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
ima: re-initialize iint->atomic_flags
maintainers: update trusted keys
Diffstat (limited to 'fs/ext4/fsmap.c')
0 files changed, 0 insertions, 0 deletions