diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-11 09:46:12 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-11 09:46:12 +0100 |
| commit | f033ffda6f7a7b7019622f45dd3473684259d3c1 (patch) | |
| tree | 54c78be46846464a6c7652ea85bd516cce9e508c /patch-5.12.0-redhat.patch | |
| parent | d8e3a92bcfdc9e4632f8120339c5fdb07b9ea4df (diff) | |
| parent | 8e1dda7133e696704135e85542003b388372afa2 (diff) | |
| download | kernel-f033ffda6f7a7b7019622f45dd3473684259d3c1.tar.gz kernel-f033ffda6f7a7b7019622f45dd3473684259d3c1.tar.xz kernel-f033ffda6f7a7b7019622f45dd3473684259d3c1.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc2.20210310git05a59d79793d.168.vanilla.1.fc35kernel-5.12.0-0.rc2.20210310git05a59d79793d.168.vanilla.1.fc34kernel-5.12.0-0.rc2.20210310git05a59d79793d.168.vanilla.1.fc33kernel-5.12.0-0.rc2.20210310git05a59d79793d.168.vanilla.1.fc32
Diffstat (limited to 'patch-5.12.0-redhat.patch')
| -rw-r--r-- | patch-5.12.0-redhat.patch | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index 92c4767e4..ee803bc2d 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -55,14 +55,13 @@ kernel/module_signing.c | 9 +- kernel/panic.c | 14 ++ kernel/rh_taint.c | 93 ++++++++ - mm/kmemleak.c | 5 + scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 64 files changed, 1143 insertions(+), 180 deletions(-) + 63 files changed, 1138 insertions(+), 180 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -2399,22 +2398,6 @@ index 000000000000..4050b6dead75 + name ? name : "kernel"); +} +EXPORT_SYMBOL(mark_driver_unsupported); -diff --git a/mm/kmemleak.c b/mm/kmemleak.c -index c0014d3b91c1..c00e9820412a 100644 ---- a/mm/kmemleak.c -+++ b/mm/kmemleak.c -@@ -1960,6 +1960,11 @@ void __init kmemleak_init(void) - */ - static int __init kmemleak_late_init(void) - { -+ if (!kmemleak_skip_disable) { -+ kmemleak_disable(); -+ return 0; -+ } -+ - kmemleak_initialized = 1; - - debugfs_create_file("kmemleak", 0644, NULL, NULL, &kmemleak_fops); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 24725e50c7b4..cdefcf29dbfc 100644 --- a/scripts/mod/modpost.c |