Mostly simple overlapping changes. For example, David Ahern's adjacency list revamp in 'net-next' conflicted with an adjacency list traversal bug fix in 'net'.
Showing the changes to include/uapi (8 of 1707 files). Show all
Unified · Split
| @@ -730,10 +730,6 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect) · 729 unmodified lines | |||
| 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) | 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) |
| 731 | #define __NR_pkey_free 290 | 731 | #define __NR_pkey_free 290 |
| 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) | 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) |
| 733 | #define __NR_pkey_get 291 | ||
| 734 | //__SYSCALL(__NR_pkey_get, sys_pkey_get) | ||
| 735 | #define __NR_pkey_set 292 | ||
| 736 | //__SYSCALL(__NR_pkey_set, sys_pkey_set) | ||
| 737 | 733 | ||
| 738 | #undef __NR_syscalls | 734 | #undef __NR_syscalls |
| 739 | #define __NR_syscalls 291 | 735 | #define __NR_syscalls 291 |
| @@ -75,6 +75,7 @@ header-y += bpf_perf_event.h · 74 unmodified lines | |||
| 75 | header-y += bpf.h | 75 | header-y += bpf.h |
| 76 | header-y += bpqether.h | 76 | header-y += bpqether.h |
| 77 | header-y += bsg.h | 77 | header-y += bsg.h |
| 78 | header-y += bt-bmc.h | ||
| 78 | header-y += btrfs.h | 79 | header-y += btrfs.h |
| 79 | header-y += can.h | 80 | header-y += can.h |
| 80 | header-y += capability.h | 81 | header-y += capability.h |
| @@ -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 */ | ||
| @@ -239,7 +239,17 @@ struct btrfs_ioctl_fs_info_args { · 238 unmodified lines | |||
| 239 | * Used by: | 239 | * Used by: |
| 240 | * struct btrfs_ioctl_feature_flags | 240 | * struct btrfs_ioctl_feature_flags |
| 241 | */ | 241 | */ |
| 242 | #define BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE (1ULL << 0) | 242 | #define BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE (1ULL << 0) |
| 243 | /* | ||
| 244 | * Older kernels (< 4.9) on big-endian systems produced broken free space tree | ||
| 245 | * bitmaps, and btrfs-progs also used to corrupt the free space tree (versions | ||
| 246 | * < 4.7.3). If this bit is clear, then the free space tree cannot be trusted. | ||
| 247 | * btrfs-progs can also intentionally clear this bit to ask the kernel to | ||
| 248 | * rebuild the free space tree, however this might not work on older kernels | ||
| 249 | * that do not know about this bit. If not sure, clear the cache manually on | ||
| 250 | * first mount when booting older kernel versions. | ||
| 251 | */ | ||
| 252 | #define BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID (1ULL << 1) | ||
| 243 | 253 | ||
| 244 | #define BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF (1ULL << 0) | 254 | #define BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF (1ULL << 0) |
| 245 | #define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (1ULL << 1) | 255 | #define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (1ULL << 1) |
| @@ -119,8 +119,7 @@ struct ethtool_cmd { · 118 unmodified lines | |||
| 119 | static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep, | 119 | static 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 | ||
| @@ -612,6 +612,8 @@ · 611 unmodified lines | |||
| 612 | */ | 612 | */ |
| 613 | #define PCI_EXP_DEVCAP2 36 /* Device Capabilities 2 */ | 613 | #define PCI_EXP_DEVCAP2 36 /* Device Capabilities 2 */ |
| 614 | #define PCI_EXP_DEVCAP2_ARI 0x00000020 /* Alternative Routing-ID */ | 614 | #define PCI_EXP_DEVCAP2_ARI 0x00000020 /* Alternative Routing-ID */ |
| 615 | #define PCI_EXP_DEVCAP2_ATOMIC_ROUTE 0x00000040 /* Atomic Op routing */ | ||
| 616 | #define PCI_EXP_DEVCAP2_ATOMIC_COMP64 0x00000100 /* Atomic 64-bit compare */ | ||
| 615 | #define PCI_EXP_DEVCAP2_LTR 0x00000800 /* Latency tolerance reporting */ | 617 | #define PCI_EXP_DEVCAP2_LTR 0x00000800 /* Latency tolerance reporting */ |
| 616 | #define PCI_EXP_DEVCAP2_OBFF_MASK 0x000c0000 /* OBFF support mechanism */ | 618 | #define PCI_EXP_DEVCAP2_OBFF_MASK 0x000c0000 /* OBFF support mechanism */ |
| 617 | #define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000 /* New message signaling */ | 619 | #define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000 /* New message signaling */ |
| @@ -619,6 +621,7 @@ · 1 unmodified line | |||
| 619 | #define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ | 621 | #define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ |
| 620 | #define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f /* Completion Timeout Value */ | 622 | #define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f /* Completion Timeout Value */ |
| 621 | #define PCI_EXP_DEVCTL2_ARI 0x0020 /* Alternative Routing-ID */ | 623 | #define PCI_EXP_DEVCTL2_ARI 0x0020 /* Alternative Routing-ID */ |
| 624 | #define PCI_EXP_DEVCTL2_ATOMIC_REQ 0x0040 /* Set Atomic requests */ | ||
| 622 | #define PCI_EXP_DEVCTL2_IDO_REQ_EN 0x0100 /* Allow IDO for requests */ | 625 | #define PCI_EXP_DEVCTL2_IDO_REQ_EN 0x0100 /* Allow IDO for requests */ |
| 623 | #define PCI_EXP_DEVCTL2_IDO_CMP_EN 0x0200 /* Allow IDO for completions */ | 626 | #define PCI_EXP_DEVCTL2_IDO_CMP_EN 0x0200 /* Allow IDO for completions */ |
| 624 | #define PCI_EXP_DEVCTL2_LTR_EN 0x0400 /* Enable LTR mechanism */ | 627 | #define PCI_EXP_DEVCTL2_LTR_EN 0x0400 /* Enable LTR mechanism */ |
| @@ -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 | ||
| @@ -0,0 +1,106 @@ | |||
| 1 | /* QLogic qedr NIC Driver | ||
| 2 | * Copyright (c) 2015-2016 QLogic Corporation | ||
| 3 | * | ||
| 4 | * This software is available to you under a choice of one of two | ||
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | ||
| 6 | * General Public License (GPL) Version 2, available from the file | ||
| 7 | * COPYING in the main directory of this source tree, or the | ||
| 8 | * OpenIB.org BSD license below: | ||
| 9 | * | ||
| 10 | * Redistribution and use in source and binary forms, with or | ||
| 11 | * without modification, are permitted provided that the following | ||
| 12 | * conditions are met: | ||
| 13 | * | ||
| 14 | * - Redistributions of source code must retain the above | ||
| 15 | * copyright notice, this list of conditions and the following | ||
| 16 | * disclaimer. | ||
| 17 | * | ||
| 18 | * - Redistributions in binary form must reproduce the above | ||
| 19 | * copyright notice, this list of conditions and the following | ||
| 20 | * disclaimer in the documentation and /or other materials | ||
| 21 | * provided with the distribution. | ||
| 22 | * | ||
| 23 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 24 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| 25 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 26 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
| 27 | * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
| 28 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| 30 | * SOFTWARE. | ||
| 31 | */ | ||
| 32 | #ifndef __QEDR_USER_H__ | ||
| 33 | #define __QEDR_USER_H__ | ||
| 34 | |||
| 35 | #include <linux/types.h> | ||
| 36 | |||
| 37 | #define QEDR_ABI_VERSION (8) | ||
| 38 | |||
| 39 | /* user kernel communication data structures. */ | ||
| 40 | |||
| 41 | struct qedr_alloc_ucontext_resp { | ||
| 42 | __u64 db_pa; | ||
| 43 | __u32 db_size; | ||
| 44 | |||
| 45 | __u32 max_send_wr; | ||
| 46 | __u32 max_recv_wr; | ||
| 47 | __u32 max_srq_wr; | ||
| 48 | __u32 sges_per_send_wr; | ||
| 49 | __u32 sges_per_recv_wr; | ||
| 50 | __u32 sges_per_srq_wr; | ||
| 51 | __u32 max_cqes; | ||
| 52 | }; | ||
| 53 | |||
| 54 | struct qedr_alloc_pd_ureq { | ||
| 55 | __u64 rsvd1; | ||
| 56 | }; | ||
| 57 | |||
| 58 | struct qedr_alloc_pd_uresp { | ||
| 59 | __u32 pd_id; | ||
| 60 | }; | ||
| 61 | |||
| 62 | struct qedr_create_cq_ureq { | ||
| 63 | __u64 addr; | ||
| 64 | __u64 len; | ||
| 65 | }; | ||
| 66 | |||
| 67 | struct qedr_create_cq_uresp { | ||
| 68 | __u32 db_offset; | ||
| 69 | __u16 icid; | ||
| 70 | }; | ||
| 71 | |||
| 72 | struct qedr_create_qp_ureq { | ||
| 73 | __u32 qp_handle_hi; | ||
| 74 | __u32 qp_handle_lo; | ||
| 75 | |||
| 76 | /* SQ */ | ||
| 77 | /* user space virtual address of SQ buffer */ | ||
| 78 | __u64 sq_addr; | ||
| 79 | |||
| 80 | /* length of SQ buffer */ | ||
| 81 | __u64 sq_len; | ||
| 82 | |||
| 83 | /* RQ */ | ||
| 84 | /* user space virtual address of RQ buffer */ | ||
| 85 | __u64 rq_addr; | ||
| 86 | |||
| 87 | /* length of RQ buffer */ | ||
| 88 | __u64 rq_len; | ||
| 89 | }; | ||
| 90 | |||
| 91 | struct qedr_create_qp_uresp { | ||
| 92 | __u32 qp_id; | ||
| 93 | __u32 atomic_supported; | ||
| 94 | |||
| 95 | /* SQ */ | ||
| 96 | __u32 sq_db_offset; | ||
| 97 | __u16 sq_icid; | ||
| 98 | |||
| 99 | /* RQ */ | ||
| 100 | __u32 rq_db_offset; | ||
| 101 | __u16 rq_icid; | ||
| 102 | |||
| 103 | __u32 rq_db2_offset; | ||
| 104 | }; | ||
| 105 | |||
| 106 | #endif /* __QEDR_USER_H__ */ | ||