diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 15:01:52 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 15:01:52 +0100 |
commit | c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2 (patch) | |
tree | 00aff822e9208ab2f2ac41c6e1a0f61c6eb9b57f /include/uapi | |
parent | 1e1851f9d725ff9f00d74dfc4b73d47cba57466f (diff) | |
parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
download | op-kernel-dev-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.zip op-kernel-dev-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.tar.gz |
Merge 4.3-rc4 into char-misc-next
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>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/userfaultfd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index df0e09b..9057d7a 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -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: |