diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 (patch) | |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 /mm/interval_tree.c | |
| parent | e0effb5fbd56a8b2b8917611cbf4fcd9aba92b8f (diff) | |
| parent | c356dc4b540edd6c02b409dd8cf3208ba2804c38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/interval_tree.c')
| -rw-r--r-- | mm/interval_tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/interval_tree.c b/mm/interval_tree.c index 27ddfd29112a..11c75fb07584 100644 --- a/mm/interval_tree.c +++ b/mm/interval_tree.c | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* | 2 | /* |
| 2 | * mm/interval_tree.c - interval tree for mapping->i_mmap | 3 | * mm/interval_tree.c - interval tree for mapping->i_mmap |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2012, Michel Lespinasse <walken@google.com> | 5 | * Copyright (C) 2012, Michel Lespinasse <walken@google.com> |
| 5 | * | ||
| 6 | * This file is released under the GPL v2. | ||
| 7 | */ | 6 | */ |
| 8 | 7 | ||
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |