diff options
| author | John Audia <graysky@archlinux.us> | 2020-08-26 06:29:39 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-30 19:44:47 +0200 |
| commit | 05b8e84362b8455dec6db9b862826f21e8f24341 (patch) | |
| tree | fc8ec494e6ca0531225d94be7346713d91e65893 /target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch | |
| parent | f589bd9283457f0bfddfeb2af468a413a3802b9b (diff) | |
| download | upstream-05b8e84362b8455dec6db9b862826f21e8f24341.tar.gz upstream-05b8e84362b8455dec6db9b862826f21e8f24341.tar.bz2 upstream-05b8e84362b8455dec6db9b862826f21e8f24341.zip | |
kernel: bump 5.4 to 5.4.61
Manually merged:
backport-5.4
011-kbuild-export-SUBARCH.patch
layerscape
701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch
All other modifications made by update_kernel.sh
Build-tested: x86/64, lantiq/xrx200, ramips/mt7621
Run-tested: ipq806x (R7800), lantiq/xrx200, x86/64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[minor commit message adjustments]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch b/target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch index a681e2d921..65b996d879 100644 --- a/target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch +++ b/target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch @@ -100,7 +100,7 @@ Reviewed-by: Sahil Malhotra <sahil.malhotra@nxp.com> + $ keyctl load secure kmk-master "load 'cat secure_key.blob'" @u --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -9073,6 +9073,17 @@ F: include/keys/trusted-type.h +@@ -9074,6 +9074,17 @@ F: include/keys/trusted-type.h F: security/keys/trusted.c F: include/keys/trusted.h |