diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-14 17:03:24 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-14 17:03:24 -0600 |
| commit | e4c4b0e45dfd1212831ad5bd129c6781d55e162a (patch) | |
| tree | 257381322eb2d6496e57e29cd02bc3cc3fa25e7a /drivers/fpga/fpga-mgr.c | |
| parent | Merge tag 'acpi-4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | integrity: support new struct public_key_signature encoding field (diff) | |
| download | linux-dev-e4c4b0e45dfd1212831ad5bd129c6781d55e162a.tar.xz linux-dev-e4c4b0e45dfd1212831ad5bd129c6781d55e162a.zip | |
Merge branch 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull integrity fix from James Morris:
"Fix a bug introduced with in this merge window in 82f94f24475c ("KEYS:
Provide software public key query function [ver #2]")"
* 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
integrity: support new struct public_key_signature encoding field
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions