forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-4.4/core' into for-4.4/drivers

Browse source 
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Jens Axboe 2015-10-09 10:40:29 -06:00
commit 54ef2b9687
690 changed files with 7240 additions and 3954 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/uapi/linux/lwtunnel.h
View file

@ -21,8 +21,6 @@ enum lwtunnel_ip_t {
LWTUNNEL_IP_SRC,
LWTUNNEL_IP_TTL,
LWTUNNEL_IP_TOS,
LWTUNNEL_IP_SPORT,
LWTUNNEL_IP_DPORT,
LWTUNNEL_IP_FLAGS,
__LWTUNNEL_IP_MAX,
};
@ -36,8 +34,6 @@ enum lwtunnel_ip6_t {
LWTUNNEL_IP6_SRC,
LWTUNNEL_IP6_HOPLIMIT,
LWTUNNEL_IP6_TC,
LWTUNNEL_IP6_SPORT,
LWTUNNEL_IP6_DPORT,
LWTUNNEL_IP6_FLAGS,
__LWTUNNEL_IP6_MAX,
};

2
include/uapi/linux/userfaultfd.h
View file

@ -11,8 +11,6 @@
#include <linux/types.h>
#include <linux/compiler.h>
#define UFFD_API ((__u64)0xAA)
/*
* After implementing the respective features it will become: