summaryrefslogtreecommitdiffstats
path: root/mm/hugetlb.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 07:27:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 07:27:16 +0200
commit23004ec330925e6834c8ddac00e3dd12eb5fb345 (patch)
tree6bcbf18d8a2429e16f842b8a357f439f4f8d3926 /mm/hugetlb.c
parent4c1d2fc7d56cf87a0d399be69e08d5aef73802eb (diff)
parentf2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff)
downloadlinux-stable-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.gz
linux-stable-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.bz2
linux-stable-23004ec330925e6834c8ddac00e3dd12eb5fb345.zip
Merge 5.2-rc3 into staging-next
We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r--mm/hugetlb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 81718c56b8f5..ac843d32b019 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Generic hugetlb support.
* (C) Nadia Yvette Chambers, April 2004