History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

One conflict in the BPF samples Makefile, some fixes in 'net' whilst we were converting over to Makefile.target rules in 'net-next'.

David S. Miller committed 7 years ago

Commit 14684b92 parents 92da362 0058b0a260 files · +2201 −938Browse files

Showing the changes to include/uapi/linux (10 of 260 files). Show all

Unified · Split

10 files
  1. include/uapi/linux/can.h +1 −1
  2. include/uapi/linux/can/bcm.h +1 −1
  3. include/uapi/linux/can/error.h +1 −1
  4. include/uapi/linux/can/gw.h +1 −1
  5. include/uapi/linux/can/j1939.h +1 −1
  6. include/uapi/linux/can/netlink.h +1 −1
  7. include/uapi/linux/can/raw.h +1 −1
  8. include/uapi/linux/can/vxcan.h +1 −1
  9. include/uapi/linux/nvme_ioctl.h +1 −0
  10. include/uapi/linux/sched.h +4 −0
include/uapi/linux/can.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-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2/*2/*
3 * linux/can.h3 * linux/can.h
4 *4 *
include/uapi/linux/can/bcm.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-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2/*2/*
3 * linux/can/bcm.h3 * linux/can/bcm.h
4 *4 *
include/uapi/linux/can/error.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-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2/*2/*
3 * linux/can/error.h3 * linux/can/error.h
4 *4 *
include/uapi/linux/can/gw.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-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2/*2/*
3 * linux/can/gw.h3 * linux/can/gw.h
4 *4 *
include/uapi/linux/can/j1939.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */1/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2/*2/*
3 * j1939.h3 * j1939.h
4 *4 *
include/uapi/linux/can/netlink.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */1/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2/*2/*
3 * linux/can/netlink.h3 * linux/can/netlink.h
4 *4 *
include/uapi/linux/can/raw.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-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2/*2/*
3 * linux/can/raw.h3 * linux/can/raw.h
4 *4 *
include/uapi/linux/can/vxcan.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */1/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2#ifndef _UAPI_CAN_VXCAN_H2#ifndef _UAPI_CAN_VXCAN_H
3#define _UAPI_CAN_VXCAN_H3#define _UAPI_CAN_VXCAN_H
4 4
include/uapi/linux/nvme_ioctl.h+1−0
@@ -63,6 +63,7 @@ struct nvme_passthru_cmd64 { · 62 unmodified lines
63 __u32 cdw14;63 __u32 cdw14;
64 __u32 cdw15;64 __u32 cdw15;
65 __u32 timeout_ms;65 __u32 timeout_ms;
66 __u32 rsvd2;
66 __u64 result;67 __u64 result;
67};68};
68 69
include/uapi/linux/sched.h+4−0
@@ -51,6 +51,10 @@ · 50 unmodified lines
51 * sent when the child exits.51 * sent when the child exits.
52 * @stack: Specify the location of the stack for the52 * @stack: Specify the location of the stack for the
53 * child process.53 * child process.
54 * Note, @stack is expected to point to the
55 * lowest address. The stack direction will be
56 * determined by the kernel and set up
57 * appropriately based on @stack_size.
54 * @stack_size: The size of the stack for the child process.58 * @stack_size: The size of the stack for the child process.
55 * @tls: If CLONE_SETTLS is set, the tls descriptor59 * @tls: If CLONE_SETTLS is set, the tls descriptor
56 * is set to tls.60 * is set to tls.