History

Merge tag 'v4.9-rc4' into sound

Bring in -rc4 patches so I can successfully merge the sound doc changes.

Jonathan Corbet committed 9 years ago

Commit 917fef62 parents 0c9aa20 bc33b0c993 files · +11207 −6734Browse files

Showing the changes to include/uapi/linux (4 of 993 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/bt-bmc.h +18 −0
  3. include/uapi/linux/ethtool.h +1 −2
  4. include/uapi/linux/rtnetlink.h +1 −1
include/uapi/linux/Kbuild+1−0
@@ -75,6 +75,7 @@ header-y += bpf_perf_event.h · 74 unmodified lines
7575 header-y += bpf.h
7676 header-y += bpqether.h
7777 header-y += bsg.h
78+header-y += bt-bmc.h
7879 header-y += btrfs.h
7980 header-y += can.h
8081 header-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 */
include/uapi/linux/ethtool.h+1−2
@@ -119,8 +119,7 @@ struct ethtool_cmd { · 118 unmodified lines
119119 static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
120120 __u32 speed)
121121 {
122−
123− ep->speed = (__u16)speed;
122+ ep->speed = (__u16)(speed & 0xFFFF);
124123 ep->speed_hi = (__u16)(speed >> 16);
125124 }
126125
include/uapi/linux/rtnetlink.h+1−1
@@ -350,7 +350,7 @@ struct rtnexthop { · 349 unmodified lines
350350 #define RTNH_F_OFFLOAD 8 /* offloaded route */
351351 #define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */
352352
353−#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN)
353+#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD)
354354
355355 /* Macros to handle hexthops */
356356

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