aboutsummaryrefslogtreecommitdiffstats
path: root/p12
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-30 10:20:57 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-30 10:20:57 +0100
commitee9dcf22a075bce42d85b58108ca601ca434e663 (patch)
tree3d45f9e2fe020d467fbca570d9c4d481afa190ac /p12
parent40c493e29885df8b9e3eaef8418af97ce8a90967 (diff)
downloadpatches-ee9dcf22a075bce42d85b58108ca601ca434e663.tar.gz
update patches based on what is merged in Linus's tree
Diffstat (limited to 'p12')
-rw-r--r--p122
1 files changed, 1 insertions, 1 deletions
diff --git a/p12 b/p12
index e23529bb75119c..257ccd569adbc6 100644
--- a/p12
+++ b/p12
@@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
-@@ -810,9 +810,6 @@ static int __init xen_p2m_debugfs(void)
+@@ -817,9 +817,6 @@ static int __init xen_p2m_debugfs(void)
{
struct dentry *d_xen = xen_init_debugfs();