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

Simple cases of overlapping changes in the packet scheduler. Must easier to resolve this time. Which probably means that I screwed it up somehow.

David S. Miller committed 9 years ago

Commit 4dc67582 parents 19aeeb9 3fefc31148 files · +1125 −436Browse files

Showing the changes to tools/include/uapi (14 of 148 files). Show all

Unified · Split

14 files

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef __ASM_GENERIC_IOCTLS_H	2	#ifndef __ASM_GENERIC_IOCTLS_H
2	#define __ASM_GENERIC_IOCTLS_H	3	#define __ASM_GENERIC_IOCTLS_H
3		4

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef __ASM_GENERIC_MMAN_COMMON_H	2	#ifndef __ASM_GENERIC_MMAN_COMMON_H
2	#define __ASM_GENERIC_MMAN_COMMON_H	3	#define __ASM_GENERIC_MMAN_COMMON_H
3		4

@@ -1,8 +1,8 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef __ASM_GENERIC_MMAN_H	2	#ifndef __ASM_GENERIC_MMAN_H
3	#define __ASM_GENERIC_MMAN_H	3	#define __ASM_GENERIC_MMAN_H
4		4
5	#include <uapi/asm-generic/mman-common.h>	5	#include <asm-generic/mman-common.h>
6		6
7	#define MAP_GROWSDOWN 0x0100 /* stack-like segment */	7	#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
8	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */	8	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com	2	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
2	*	3	*
3	* This program is free software; you can redistribute it and/or	4	* This program is free software; you can redistribute it and/or

@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI__LINUX_BPF_COMMON_H__	2	#ifndef _UAPI__LINUX_BPF_COMMON_H__
3	#define _UAPI__LINUX_BPF_COMMON_H__	3	#define _UAPI__LINUX_BPF_COMMON_H__
4		4

@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_FCNTL_H	2	#ifndef _UAPI_LINUX_FCNTL_H
3	#define _UAPI_LINUX_FCNTL_H	3	#define _UAPI_LINUX_FCNTL_H
4		4

@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_HW_BREAKPOINT_H	2	#ifndef _UAPI_LINUX_HW_BREAKPOINT_H
3	#define _UAPI_LINUX_HW_BREAKPOINT_H	3	#define _UAPI_LINUX_HW_BREAKPOINT_H
4		4

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef __LINUX_KVM_H	2	#ifndef __LINUX_KVM_H
2	#define __LINUX_KVM_H	3	#define __LINUX_KVM_H
3		4

@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_MMAN_H	2	#ifndef _UAPI_LINUX_MMAN_H
3	#define _UAPI_LINUX_MMAN_H	3	#define _UAPI_LINUX_MMAN_H
4		4

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	/*	2	/*
2	* Performance events:	3	* Performance events:
3	*	4	*

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef _UAPI_LINUX_SCHED_H	2	#ifndef _UAPI_LINUX_SCHED_H
2	#define _UAPI_LINUX_SCHED_H	3	#define _UAPI_LINUX_SCHED_H
3		4

@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_STAT_H	2	#ifndef _UAPI_LINUX_STAT_H
3	#define _UAPI_LINUX_STAT_H	3	#define _UAPI_LINUX_STAT_H
4		4

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef _LINUX_VHOST_H	2	#ifndef _LINUX_VHOST_H
2	#define _LINUX_VHOST_H	3	#define _LINUX_VHOST_H
3	/* Userspace interface for in-kernel virtio accelerators. */	4	/* Userspace interface for in-kernel virtio accelerators. */

@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
1	/*	2	/*
2	* Advanced Linux Sound Architecture - ALSA - Driver	3	* Advanced Linux Sound Architecture - ALSA - Driver
3	* Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,	4	* Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,