History

Merge 4.9-rc3 into staging-next

This resolves a merge issue with drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in here as well.

Greg Kroah-Hartman committed 10 years ago

Commit bdc06562 parents 32774ef a909d3e558 files · +5423 −3089Browse files

Showing the changes to include/uapi (3 of 558 files). Show all

Unified · Split

3 files
  1. include/uapi/asm-generic/unistd.h +0 −4
  2. include/uapi/linux/Kbuild +1 −0
  3. include/uapi/linux/bt-bmc.h +18 −0
include/uapi/asm-generic/unistd.h+0−4
@@ -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 290731#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_syscalls734#undef __NR_syscalls
739#define __NR_syscalls 291735#define __NR_syscalls 291
include/uapi/linux/Kbuild+1−0
@@ -75,6 +75,7 @@ header-y += bpf_perf_event.h · 74 unmodified lines
75header-y += bpf.h75header-y += bpf.h
76header-y += bpqether.h76header-y += bpqether.h
77header-y += bsg.h77header-y += bsg.h
78header-y += bt-bmc.h
78header-y += btrfs.h79header-y += btrfs.h
79header-y += can.h80header-y += can.h
80header-y += capability.h81header-y += capability.h
include/uapi/linux/bt-bmc.h+18−0
@@ -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 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t