diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-05 06:34:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-05 06:34:29 -0500 |
| commit | ef0b8b9a521c65201bfca9747ee1bf374296133c (patch) | |
| tree | 644c3390c07d06fb7807182a4935f7c3f675b157 /include/uapi/linux/unix_diag.h | |
| parent | 5c12af0c41e3417e1939095325920463b5f8e726 (diff) | |
| parent | d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff) | |
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
Conflicts:
arch/x86/platform/efi/efi.c
drivers/firmware/efi/Kconfig
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/unix_diag.h')
| -rw-r--r-- | include/uapi/linux/unix_diag.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/unix_diag.h b/include/uapi/linux/unix_diag.h index b9e2a6a7446f..1eb0b8dd1830 100644 --- a/include/uapi/linux/unix_diag.h +++ b/include/uapi/linux/unix_diag.h | |||
| @@ -31,6 +31,7 @@ struct unix_diag_msg { | |||
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | enum { | 33 | enum { |
| 34 | /* UNIX_DIAG_NONE, standard nl API requires this attribute! */ | ||
| 34 | UNIX_DIAG_NAME, | 35 | UNIX_DIAG_NAME, |
| 35 | UNIX_DIAG_VFS, | 36 | UNIX_DIAG_VFS, |
| 36 | UNIX_DIAG_PEER, | 37 | UNIX_DIAG_PEER, |