History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Backmerge Linus master to get the connector locking revert. * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (645 commits) sysctl: fix proc_doulongvec_ms_jiffies_minmax() Revert "drm/probe-helpers: Drop locking from poll_enable" MAINTAINERS: add Dan Streetman to zbud maintainers MAINTAINERS: add Dan Streetman to zswap maintainers mm: do not export ioremap_page_range symbol for external module mn10300: fix build error of missing fpu_save() romfs: use different way to generate fsid for BLOCK or MTD frv: add missing atomic64 operations mm, page_alloc: fix premature OOM when racing with cpuset mems update mm, page_alloc: move cpuset seqcount checking to slowpath mm, page_alloc: fix fast-path race with cpuset update or removal mm, page_alloc: fix check for NULL preferred_zone kernel/panic.c: add missing \n fbdev: color map copying bounds checking frv: add atomic64_add_unless() mm/mempolicy.c: do not put mempolicy before using its nodemask radix-tree: fix private list warnings Documentation/filesystems/proc.txt: add VmPin mm, memcg: do not retry precharge charges proc: add a schedule point in proc_pid_readdir() ...

Dave Airlie committed 9 years ago

Commit b0df0b22 parents f0493e6 ff9f8a7636 files · +5919 −3365Browse files

Showing the changes to include/uapi (5 of 636 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/nl80211.h +3 −1
  3. include/uapi/linux/pkt_cls.h +1 −1
  4. include/uapi/linux/tc_act/tc_bpf.h +1 −1
  5. include/uapi/linux/timerfd.h +36 −0
include/uapi/linux/Kbuild+1−0
@@ -414,6 +414,7 @@ header-y += telephony.h · 413 unmodified lines
414header-y += termios.h414header-y += termios.h
415header-y += thermal.h415header-y += thermal.h
416header-y += time.h416header-y += time.h
417header-y += timerfd.h
417header-y += times.h418header-y += times.h
418header-y += timex.h419header-y += timex.h
419header-y += tiocl.h420header-y += tiocl.h
include/uapi/linux/nl80211.h+3−1
@@ -1772,7 +1772,9 @@ enum nl80211_commands { · 1771 unmodified lines
1772 *1772 *
1773 * @NL80211_ATTR_OPMODE_NOTIF: Operating mode field from Operating Mode1773 * @NL80211_ATTR_OPMODE_NOTIF: Operating mode field from Operating Mode
1774 * Notification Element based on association request when used with1774 * Notification Element based on association request when used with
1775 * %NL80211_CMD_NEW_STATION; u8 attribute.1775 * %NL80211_CMD_NEW_STATION or %NL80211_CMD_SET_STATION (only when
1776 * %NL80211_FEATURE_FULL_AP_CLIENT_STATE is supported, or with TDLS);
1777 * u8 attribute.
1776 *1778 *
1777 * @NL80211_ATTR_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if1779 * @NL80211_ATTR_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if
1778 * %NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet)1780 * %NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet)
include/uapi/linux/pkt_cls.h+1−1
@@ -397,7 +397,7 @@ enum { · 396 unmodified lines
397 TCA_BPF_NAME,397 TCA_BPF_NAME,
398 TCA_BPF_FLAGS,398 TCA_BPF_FLAGS,
399 TCA_BPF_FLAGS_GEN,399 TCA_BPF_FLAGS_GEN,
400 TCA_BPF_DIGEST,400 TCA_BPF_TAG,
401 __TCA_BPF_MAX,401 __TCA_BPF_MAX,
402};402};
403 403
include/uapi/linux/tc_act/tc_bpf.h+1−1
@@ -27,7 +27,7 @@ enum { · 26 unmodified lines
27 TCA_ACT_BPF_FD,27 TCA_ACT_BPF_FD,
28 TCA_ACT_BPF_NAME,28 TCA_ACT_BPF_NAME,
29 TCA_ACT_BPF_PAD,29 TCA_ACT_BPF_PAD,
30 TCA_ACT_BPF_DIGEST,30 TCA_ACT_BPF_TAG,
31 __TCA_ACT_BPF_MAX,31 __TCA_ACT_BPF_MAX,
32};32};
33#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)33#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
include/uapi/linux/timerfd.h+36−0
@@ -0,0 +1,36 @@
1/*
2 * include/linux/timerfd.h
3 *
4 * Copyright (C) 2007 Davide Libenzi <davidel@xmailserver.org>
5 *
6 */
7
8#ifndef _UAPI_LINUX_TIMERFD_H
9#define _UAPI_LINUX_TIMERFD_H
10
11#include <linux/types.h>
12
13/* For O_CLOEXEC and O_NONBLOCK */
14#include <linux/fcntl.h>
15
16/* For _IO helpers */
17#include <linux/ioctl.h>
18
19/*
20 * CAREFUL: Check include/asm-generic/fcntl.h when defining
21 * new flags, since they might collide with O_* ones. We want
22 * to re-use O_* flags that couldn't possibly have a meaning
23 * from eventfd, in order to leave a free define-space for
24 * shared O_* flags.
25 *
26 * Also make sure to update the masks in include/linux/timerfd.h
27 * when adding new flags.
28 */
29#define TFD_TIMER_ABSTIME (1 << 0)
30#define TFD_TIMER_CANCEL_ON_SET (1 << 1)
31#define TFD_CLOEXEC O_CLOEXEC
32#define TFD_NONBLOCK O_NONBLOCK
33
34#define TFD_IOC_SET_TICKS _IOW('T', 0, __u64)
35
36#endif /* _UAPI_LINUX_TIMERFD_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