Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 build cleanup from Ingo Molnar:
 "A single change that removes unnecessary asm-generic wrappers"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Remove unneeded uapi asm-generic wrappers

arch/x86/include/uapi/asm/errno.h

@@ -1 +0,0 @@
-#include <asm-generic/errno.h>

arch/x86/include/uapi/asm/fcntl.h

@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>

arch/x86/include/uapi/asm/ioctl.h

@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>

arch/x86/include/uapi/asm/ioctls.h

@@ -1 +0,0 @@
-#include <asm-generic/ioctls.h>

arch/x86/include/uapi/asm/ipcbuf.h

@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>

arch/x86/include/uapi/asm/param.h

@@ -1 +0,0 @@
-#include <asm-generic/param.h>

arch/x86/include/uapi/asm/resource.h

@@ -1 +0,0 @@
-#include <asm-generic/resource.h>

arch/x86/include/uapi/asm/termbits.h

@@ -1 +0,0 @@
-#include <asm-generic/termbits.h>

arch/x86/include/uapi/asm/termios.h

@@ -1 +0,0 @@
-#include <asm-generic/termios.h>

arch/x86/include/uapi/asm/types.h

@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _ASM_X86_TYPES_H
-#define _ASM_X86_TYPES_H
-
-#include <asm-generic/types.h>
-
-#endif /* _ASM_X86_TYPES_H */