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 (20 of 559 files). Show all

Unified · Split

20 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
  5. include/uapi/rdma/cxgb3-abi.h +1 −1
  6. include/uapi/rdma/cxgb4-abi.h +1 −1
  7. include/uapi/rdma/hns-abi.h +1 −1
  8. include/uapi/rdma/ib_user_cm.h +1 −1
  9. include/uapi/rdma/ib_user_ioctl_verbs.h +1 −1
  10. include/uapi/rdma/ib_user_mad.h +1 −1
  11. include/uapi/rdma/ib_user_sa.h +1 −1
  12. include/uapi/rdma/ib_user_verbs.h +1 −1
  13. include/uapi/rdma/mlx4-abi.h +1 −1
  14. include/uapi/rdma/mlx5-abi.h +1 −1
  15. include/uapi/rdma/mthca-abi.h +1 −1
  16. include/uapi/rdma/nes-abi.h +1 −1
  17. include/uapi/rdma/qedr-abi.h +1 −1
  18. include/uapi/rdma/rdma_user_cm.h +1 −1
  19. include/uapi/rdma/rdma_user_ioctl.h +1 −1
  20. include/uapi/rdma/rdma_user_rxe.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 *
include/uapi/rdma/cxgb3-abi.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) 2006 Chelsio, Inc. All rights reserved.3 * Copyright (c) 2006 Chelsio, Inc. All rights reserved.
4 *4 *
include/uapi/rdma/cxgb4-abi.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) 2009-2010 Chelsio, Inc. All rights reserved.3 * Copyright (c) 2009-2010 Chelsio, Inc. All rights reserved.
4 *4 *
include/uapi/rdma/hns-abi.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 Hisilicon Limited.3 * Copyright (c) 2016 Hisilicon Limited.
4 *4 *
include/uapi/rdma/ib_user_cm.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) 2005 Topspin Communications. All rights reserved.3 * Copyright (c) 2005 Topspin Communications. All rights reserved.
4 * Copyright (c) 2005 Intel Corporation. All rights reserved.4 * Copyright (c) 2005 Intel Corporation. All rights reserved.
include/uapi/rdma/ib_user_ioctl_verbs.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) 2017-2018, Mellanox Technologies inc. All rights reserved.3 * Copyright (c) 2017-2018, Mellanox Technologies inc. All rights reserved.
4 *4 *
include/uapi/rdma/ib_user_mad.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) 2004 Topspin Communications. All rights reserved.3 * Copyright (c) 2004 Topspin Communications. All rights reserved.
4 * Copyright (c) 2005 Voltaire, Inc. All rights reserved.4 * Copyright (c) 2005 Voltaire, Inc. All rights reserved.
include/uapi/rdma/ib_user_sa.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) 2005 Intel Corporation. All rights reserved.3 * Copyright (c) 2005 Intel Corporation. All rights reserved.
4 *4 *
include/uapi/rdma/ib_user_verbs.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) 2005 Topspin Communications. All rights reserved.3 * Copyright (c) 2005 Topspin Communications. All rights reserved.
4 * Copyright (c) 2005, 2006 Cisco Systems. All rights reserved.4 * Copyright (c) 2005, 2006 Cisco Systems. All rights reserved.
include/uapi/rdma/mlx4-abi.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) 2007 Cisco Systems, Inc. All rights reserved.3 * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
4 * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.4 * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
include/uapi/rdma/mlx5-abi.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) 2013-2015, Mellanox Technologies. All rights reserved.3 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
4 *4 *
include/uapi/rdma/mthca-abi.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) 2005 Topspin Communications. All rights reserved.3 * Copyright (c) 2005 Topspin Communications. All rights reserved.
4 * Copyright (c) 2005, 2006 Cisco Systems. All rights reserved.4 * Copyright (c) 2005, 2006 Cisco Systems. All rights reserved.
include/uapi/rdma/nes-abi.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) 2006 - 2011 Intel Corporation. All rights reserved.3 * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved.
4 * Copyright (c) 2005 Topspin Communications. All rights reserved.4 * Copyright (c) 2005 Topspin Communications. All rights reserved.
include/uapi/rdma/qedr-abi.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/* QLogic qedr NIC Driver2/* QLogic qedr NIC Driver
3 * Copyright (c) 2015-2016 QLogic Corporation3 * Copyright (c) 2015-2016 QLogic Corporation
4 *4 *
include/uapi/rdma/rdma_user_cm.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) 2005-2006 Intel Corporation. All rights reserved.3 * Copyright (c) 2005-2006 Intel Corporation. All rights reserved.
4 *4 *
include/uapi/rdma/rdma_user_ioctl.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 Mellanox Technologies, LTD. All rights reserved.3 * Copyright (c) 2016 Mellanox Technologies, LTD. All rights reserved.
4 *4 *
include/uapi/rdma/rdma_user_rxe.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 Mellanox Technologies Ltd. All rights reserved.3 * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
4 *4 *

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