diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-20 14:21:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-20 14:21:32 +0100 |
| commit | b37bdda47743adf2b7f084cd9dcb6ef1f043c164 (patch) | |
| tree | 3f2ba9bed19ebeac2ad800369c6b2247acde7b8e /fs/crypto/keyring.c | |
| parent | 1a6f440f783f2cb920d0bcdad04e37081d1416e9 (diff) | |
| parent | 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 (diff) | |
| download | linux-next-b37bdda47743adf2b7f084cd9dcb6ef1f043c164.tar.gz | |
Merge remote-tracking branch 'integrity/next-integrity'
# Conflicts:
# arch/s390/kernel/machine_kexec_file.c
Diffstat (limited to 'fs/crypto/keyring.c')
0 files changed, 0 insertions, 0 deletions