diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-08 04:17:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-08 04:17:15 -0500 |
| commit | 8a103df440afea30c91ebd42e61dc644e647f4bd (patch) | |
| tree | 2cfa99e9c6e1e138e1404bce4294e46cb0034cce /include/uapi/linux/raid | |
| parent | a9903f04e0a4ea522d959c2f287cdf0ab029e324 (diff) | |
| parent | fbc3edf7d7731d7a22c483c679700589bab936a3 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/raid')
| -rw-r--r-- | include/uapi/linux/raid/md_p.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/raid/md_u.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h index b9197976b660..b0d15c73f6d7 100644 --- a/include/uapi/linux/raid/md_p.h +++ b/include/uapi/linux/raid/md_p.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ | ||
| 1 | /* | 2 | /* |
| 2 | md_p.h : physical layout of Linux RAID devices | 3 | md_p.h : physical layout of Linux RAID devices |
| 3 | Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman | 4 | Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman |
diff --git a/include/uapi/linux/raid/md_u.h b/include/uapi/linux/raid/md_u.h index 36cd8210a5d1..105307244961 100644 --- a/include/uapi/linux/raid/md_u.h +++ b/include/uapi/linux/raid/md_u.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ | ||
| 1 | /* | 2 | /* |
| 2 | md_u.h : user <=> kernel API between Linux raidtools and RAID drivers | 3 | md_u.h : user <=> kernel API between Linux raidtools and RAID drivers |
| 3 | Copyright (C) 1998 Ingo Molnar | 4 | Copyright (C) 1998 Ingo Molnar |