History

Merge tag 'v4.9-rc5' into patchwork

Linux 4.9-rc5 * tag 'v4.9-rc5': (1102 commits) Linux 4.9-rc5 gp8psk: Fix DVB frontend attach gp8psk: fix gp8psk_usb_in_op() logic dvb-usb: move data_mutex to struct dvb_usb_device iio: maxim_thermocouple: detect invalid storage size in read() aoe: fix crash in page count manipulation lightnvm: invalid offset calculation for lba_shift Kbuild: enable -Wmaybe-uninitialized warnings by default pcmcia: fix return value of soc_pcmcia_regulator_set infiniband: shut up a maybe-uninitialized warning crypto: aesni: shut up -Wmaybe-uninitialized warning rc: print correct variable for z8f0811 dib0700: fix nec repeat handling s390: pci: don't print uninitialized data for debugging nios2: fix timer initcall return value x86: apm: avoid uninitialized data NFSv4.1: work around -Wmaybe-uninitialized warning Kbuild: enable -Wmaybe-uninitialized warning for "make W=1" lib/stackdepot: export save/fetch stack for drivers mm: kmemleak: scan .data.ro_after_init ...

Mauro Carvalho Chehab committed 10 years ago

Commit 36f94a52 parents c0026c7 a25f0941181 files · +12256 −7505Browse files

Showing the changes to include/uapi/linux (4 of 1181 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
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 */
include/uapi/linux/ethtool.h+1−2
@@ -119,8 +119,7 @@ struct ethtool_cmd { · 118 unmodified lines
119static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,119static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
120 __u32 speed)120 __u32 speed)
121{121{
122 122 ep->speed = (__u16)(speed & 0xFFFF);
123 ep->speed = (__u16)speed;
124 ep->speed_hi = (__u16)(speed >> 16);123 ep->speed_hi = (__u16)(speed >> 16);
125}124}
126 125
include/uapi/linux/rtnetlink.h+1−1
@@ -350,7 +350,7 @@ struct rtnexthop { · 349 unmodified lines
350#define RTNH_F_OFFLOAD 8 /* offloaded route */350#define RTNH_F_OFFLOAD 8 /* offloaded route */
351#define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */351#define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */
352 352
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)
354 354
355/* Macros to handle hexthops */355/* Macros to handle hexthops */
356 356