diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
| commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
| tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /arch/alpha/mm | |
| parent | 4e974c120039e35b90d2cb0459452bd9a6a71594 (diff) | |
| parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
Diffstat (limited to 'arch/alpha/mm')
| -rw-r--r-- | arch/alpha/mm/fault.c | 1 | ||||
| -rw-r--r-- | arch/alpha/mm/init.c | 1 | ||||
| -rw-r--r-- | arch/alpha/mm/numa.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index c25e8827e7cd..cd3c572ee912 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/alpha/mm/fault.c * diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 0542e973c73d..9d74520298ab 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/alpha/mm/init.c * diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index d543d71c28b4..a9e86475f169 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/alpha/mm/numa.c * |