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

Merge 4.3-rc4 into char-misc-next

Browse source 
This is needed due to the duplicated iommu stuff to help with the merge
and to prevent future issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2015-10-06 15:01:52 +01:00
commit c39b7eef7d
285 changed files with 2457 additions and 1583 deletions
Download patch file Download diff file Expand all files Collapse all files

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: