This resolves a merge issue with drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in here as well.
Showing the changes to include/uapi (3 of 558 files). Show all
Unified · Split
| @@ -730,10 +730,6 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect) · 729 unmodified lines | |||
| 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) | 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) |
| 731 | #define __NR_pkey_free 290 | 731 | #define __NR_pkey_free 290 |
| 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) | 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) |
| 733 | #define __NR_pkey_get 291 | ||
| 734 | //__SYSCALL(__NR_pkey_get, sys_pkey_get) | ||
| 735 | #define __NR_pkey_set 292 | ||
| 736 | //__SYSCALL(__NR_pkey_set, sys_pkey_set) | ||
| 737 | 733 | ||
| 738 | #undef __NR_syscalls | 734 | #undef __NR_syscalls |
| 739 | #define __NR_syscalls 291 | 735 | #define __NR_syscalls 291 |
| @@ -75,6 +75,7 @@ header-y += bpf_perf_event.h · 74 unmodified lines | |||
| 75 | header-y += bpf.h | 75 | header-y += bpf.h |
| 76 | header-y += bpqether.h | 76 | header-y += bpqether.h |
| 77 | header-y += bsg.h | 77 | header-y += bsg.h |
| 78 | header-y += bt-bmc.h | ||
| 78 | header-y += btrfs.h | 79 | header-y += btrfs.h |
| 79 | header-y += can.h | 80 | header-y += can.h |
| 80 | header-y += capability.h | 81 | header-y += capability.h |
| @@ -0,0 +1,18 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2015-2016, IBM Corporation. | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or | ||
| 5 | * modify it under the terms of the GNU General Public License | ||
| 6 | * as published by the Free Software Foundation; either version | ||
| 7 | * 2 of the License, or (at your option) any later version. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef _UAPI_LINUX_BT_BMC_H | ||
| 11 | #define _UAPI_LINUX_BT_BMC_H | ||
| 12 | |||
| 13 | #include <linux/ioctl.h> | ||
| 14 | |||
| 15 | #define __BT_BMC_IOCTL_MAGIC 0xb1 | ||
| 16 | #define BT_BMC_IOCTL_SMS_ATN _IO(__BT_BMC_IOCTL_MAGIC, 0x00) | ||
| 17 | |||
| 18 | #endif /* _UAPI_LINUX_BT_BMC_H */ | ||