History

Merge drm-fixes-for-v4.17-rc6-urgent into drm-next

Need to backmerge some nouveau fixes to reduce the nouveau -next conflicts a lot.

Dave Airlie committed 8 years ago

Commit 1fafef92 parents 315852b 76ef6b2559 files · +4018 −2246Browse files

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

Unified · Split

4 files
  1. include/uapi/linux/if_infiniband.h +1 −1
  2. include/uapi/linux/nl80211.h +2 −0
  3. include/uapi/linux/rds.h +1 −1
  4. include/uapi/linux/tls.h +1 −1
include/uapi/linux/if_infiniband.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
2/*2/*
3 * This software is available to you under a choice of one of two3 * This software is available to you under a choice of one of two
4 * licenses. You may choose to be licensed under the terms of the GNU4 * licenses. You may choose to be licensed under the terms of the GNU
include/uapi/linux/nl80211.h+2−0
@@ -2698,6 +2698,8 @@ enum nl80211_attrs { · 2697 unmodified lines
2698#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS2698#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
2699#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS2699#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
2700 2700
2701#define NL80211_WIPHY_NAME_MAXLEN 128
2702
2701#define NL80211_MAX_SUPP_RATES 322703#define NL80211_MAX_SUPP_RATES 32
2702#define NL80211_MAX_SUPP_HT_RATES 772704#define NL80211_MAX_SUPP_HT_RATES 77
2703#define NL80211_MAX_SUPP_REG_RULES 642705#define NL80211_MAX_SUPP_REG_RULES 64
include/uapi/linux/rds.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */
2/*2/*
3 * Copyright (c) 2008 Oracle. All rights reserved.3 * Copyright (c) 2008 Oracle. All rights reserved.
4 *4 *
include/uapi/linux/tls.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */
2/*2/*
3 * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved.3 * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved.
4 *4 *