diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:20:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:20:57 +0100 |
| commit | ee9dcf22a075bce42d85b58108ca601ca434e663 (patch) | |
| tree | 3d45f9e2fe020d467fbca570d9c4d481afa190ac /p07 | |
| parent | 40c493e29885df8b9e3eaef8418af97ce8a90967 (diff) | |
| download | patches-ee9dcf22a075bce42d85b58108ca601ca434e663.tar.gz | |
update patches based on what is merged in Linus's tree
Diffstat (limited to 'p07')
| -rw-r--r-- | p07 | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c -@@ -2458,22 +2458,15 @@ static int fake_panic_set(void *data, u6 +@@ -2428,22 +2428,15 @@ static int fake_panic_set(void *data, u6 DEFINE_SIMPLE_ATTRIBUTE(fake_panic_fops, fake_panic_get, fake_panic_set, "%llu\n"); @@ -119,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> mce_register_injector_chain(&inject_nb); --- a/arch/x86/kernel/cpu/mce/severity.c +++ b/arch/x86/kernel/cpu/mce/severity.c -@@ -399,21 +399,13 @@ static const struct file_operations seve +@@ -404,21 +404,13 @@ static const struct file_operations seve static int __init severities_debugfs_init(void) { |