Disintegrate UAPI for x86
Can you merge the following branch into the x86 tree please.
This is to complete part of the UAPI disintegration for which the preparatory patches were pulled recently.
Note that there are some fixup patches which are at the base of the branch aimed at you, plus all arches get the asm-generic branch merged in too.
The following changes since commit 612a9aab56a93533e76e3ad91642db7033e03b69:
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (2012-10-03 23:29:23 -0700)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git disintegrate-x86
for you to fetch changes up to c64630429a9d37a248c6b06a738fad838f2f5e37:
UAPI: (Scripted) Disintegrate arch/x86/include/asm (2012-10-04 18:21:45 +0100)
----------------------------------------------------------------
David Howells (6):
UAPI: Fix the guards on various asm/unistd.h files
UAPI: Split compound conditionals containing __KERNEL__ in Arm64 Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep
UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
UAPI: (Scripted) Disintegrate include/asm-generic
UAPI: (Scripted) Disintegrate arch/x86/include/asm
Mark Salter (2):
c6x: make dsk6455 the default config
c6x: remove c6x signal.h
arch/arm64/include/asm/hwcap.h | 4 +-
arch/arm64/include/asm/stat.h | 4 +-
arch/arm64/include/asm/unistd.h | 8 +-
arch/arm64/include/asm/unistd32.h | 4 -
arch/c6x/Makefile | 2 +
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/signal.h | 17 -
arch/c6x/include/asm/unistd.h | 4 -
arch/hexagon/include/asm/unistd.h | 5 -
arch/openrisc/include/asm/unistd.h | 5 -
arch/score/include/asm/unistd.h | 5 -
arch/tile/include/asm/unistd.h | 5 -
arch/unicore32/include/asm/unistd.h | 4 -
arch/x86/include/asm/Kbuild | 24 -
arch/x86/include/asm/boot.h | 9 +-
arch/x86/include/asm/debugreg.h | 79 +-
arch/x86/include/asm/e820.h | 74 +-
arch/x86/include/asm/hw_breakpoint.h | 5 +-
arch/x86/include/asm/ist.h | 17 +-
arch/x86/include/asm/kvm_para.h | 99 +--
arch/x86/include/asm/mce.h | 119 +--
arch/x86/include/asm/msr.h | 11 +-
arch/x86/include/asm/mtrr.h | 93 +--
arch/x86/include/asm/posix_types.h | 10 -
arch/x86/include/asm/processor-flags.h | 97 +--
arch/x86/include/asm/ptrace.h | 75 +-
arch/x86/include/asm/setup.h | 5 +-
arch/x86/include/asm/sigcontext.h | 216 +----
arch/x86/include/asm/signal.h | 140 +---
arch/x86/include/asm/unistd.h | 14 +-
arch/x86/include/asm/vm86.h | 128 +--
arch/x86/include/asm/vsyscall.h | 16 +-
arch/x86/include/uapi/asm/Kbuild | 55 ++
arch/x86/include/{ => uapi}/asm/a.out.h | 0
arch/x86/include/{ => uapi}/asm/auxvec.h | 0
arch/x86/include/{ => uapi}/asm/bitsperlong.h | 0
arch/x86/include/uapi/asm/boot.h | 10 +
arch/x86/include/{ => uapi}/asm/bootparam.h | 0
arch/x86/include/{ => uapi}/asm/byteorder.h | 0
arch/x86/include/uapi/asm/debugreg.h | 80 ++
arch/x86/include/uapi/asm/e820.h | 75 ++
arch/x86/include/{ => uapi}/asm/errno.h | 0
arch/x86/include/{ => uapi}/asm/fcntl.h | 0
arch/x86/include/{ => uapi}/asm/hyperv.h | 0
arch/x86/include/{ => uapi}/asm/ioctl.h | 0
arch/x86/include/{ => uapi}/asm/ioctls.h | 0
arch/x86/include/{ => uapi}/asm/ipcbuf.h | 0
arch/x86/include/uapi/asm/ist.h | 29 +
arch/x86/include/{ => uapi}/asm/kvm.h | 0
arch/x86/include/uapi/asm/kvm_para.h | 100 +++
arch/x86/include/{ => uapi}/asm/ldt.h | 0
arch/x86/include/uapi/asm/mce.h | 121 +++
arch/x86/include/{ => uapi}/asm/mman.h | 0
arch/x86/include/{ => uapi}/asm/msgbuf.h | 0
arch/x86/include/{ => uapi}/asm/msr-index.h | 0
arch/x86/include/uapi/asm/msr.h | 15 +
arch/x86/include/uapi/asm/mtrr.h | 117 +++
arch/x86/include/{ => uapi}/asm/param.h | 0
arch/x86/include/{ => uapi}/asm/poll.h | 0
arch/x86/include/uapi/asm/posix_types.h | 9 +
arch/x86/include/{ => uapi}/asm/posix_types_32.h | 0
arch/x86/include/{ => uapi}/asm/posix_types_64.h | 0
arch/x86/include/{ => uapi}/asm/posix_types_x32.h | 0
arch/x86/include/{ => uapi}/asm/prctl.h | 0
arch/x86/include/uapi/asm/processor-flags.h | 99 +++
arch/x86/include/{ => uapi}/asm/ptrace-abi.h | 0
arch/x86/include/uapi/asm/ptrace.h | 78 ++
arch/x86/include/{ => uapi}/asm/resource.h | 0
arch/x86/include/{ => uapi}/asm/sembuf.h | 0
arch/x86/include/{ => uapi}/asm/shmbuf.h | 0
arch/x86/include/uapi/asm/sigcontext.h | 221 ++++++
arch/x86/include/{ => uapi}/asm/sigcontext32.h | 0
arch/x86/include/{ => uapi}/asm/siginfo.h | 0
arch/x86/include/uapi/asm/signal.h | 145 ++++
arch/x86/include/{ => uapi}/asm/socket.h | 0
arch/x86/include/{ => uapi}/asm/sockios.h | 0
arch/x86/include/{ => uapi}/asm/stat.h | 0
arch/x86/include/{ => uapi}/asm/statfs.h | 0
arch/x86/include/{ => uapi}/asm/swab.h | 0
arch/x86/include/{ => uapi}/asm/termbits.h | 0
arch/x86/include/{ => uapi}/asm/termios.h | 0
arch/x86/include/{ => uapi}/asm/types.h | 0
arch/x86/include/{ => uapi}/asm/ucontext.h | 0
arch/x86/include/uapi/asm/unistd.h | 17 +
arch/x86/include/uapi/asm/vm86.h | 129 +++
arch/x86/include/uapi/asm/vsyscall.h | 17 +
include/asm-generic/Kbuild | 35 -
include/asm-generic/bitsperlong.h | 13 +-
include/asm-generic/int-l64.h | 26 +-
include/asm-generic/int-ll64.h | 31 +-
include/asm-generic/ioctl.h | 95 +--
include/asm-generic/kvm_para.h | 5 +-
include/asm-generic/param.h | 17 +-
include/asm-generic/resource.h | 66 +-
include/asm-generic/siginfo.h | 297 +------
include/asm-generic/signal.h | 117 +--
include/asm-generic/statfs.h | 81 +-
include/asm-generic/termios.h | 49 +-
include/asm-generic/unistd.h | 911 +---------------------
include/linux/Kbuild | 9 +-
include/uapi/asm-generic/Kbuild | 35 +
include/{ => uapi}/asm-generic/auxvec.h | 0
include/uapi/asm-generic/bitsperlong.h | 15 +
include/{ => uapi}/asm-generic/errno-base.h | 0
include/{ => uapi}/asm-generic/errno.h | 0
include/{ => uapi}/asm-generic/fcntl.h | 0
include/uapi/asm-generic/int-l64.h | 34 +
include/uapi/asm-generic/int-ll64.h | 39 +
include/uapi/asm-generic/ioctl.h | 98 +++
include/{ => uapi}/asm-generic/ioctls.h | 0
include/{ => uapi}/asm-generic/ipcbuf.h | 0
include/{ => uapi}/asm-generic/mman-common.h | 0
include/{ => uapi}/asm-generic/mman.h | 0
include/{ => uapi}/asm-generic/msgbuf.h | 0
include/uapi/asm-generic/param.h | 19 +
include/{ => uapi}/asm-generic/poll.h | 0
include/{ => uapi}/asm-generic/posix_types.h | 0
include/uapi/asm-generic/resource.h | 68 ++
include/{ => uapi}/asm-generic/sembuf.h | 0
include/{ => uapi}/asm-generic/setup.h | 0
include/{ => uapi}/asm-generic/shmbuf.h | 0
include/{ => uapi}/asm-generic/shmparam.h | 0
include/uapi/asm-generic/siginfo.h | 298 +++++++
include/{ => uapi}/asm-generic/signal-defs.h | 0
include/uapi/asm-generic/signal.h | 123 +++
include/{ => uapi}/asm-generic/socket.h | 0
include/{ => uapi}/asm-generic/sockios.h | 0
include/{ => uapi}/asm-generic/stat.h | 0
include/uapi/asm-generic/statfs.h | 83 ++
include/{ => uapi}/asm-generic/swab.h | 0
include/{ => uapi}/asm-generic/termbits.h | 0
include/uapi/asm-generic/termios.h | 50 ++
include/{ => uapi}/asm-generic/types.h | 0
include/{ => uapi}/asm-generic/ucontext.h | 0
include/uapi/asm-generic/unistd.h | 902 +++++++++++++++++++++
security/apparmor/Makefile | 2 +-
136 files changed, 3131 insertions(+), 3003 deletions(-)
delete mode 100644 arch/c6x/include/asm/signal.h
rename arch/x86/include/{ => uapi}/asm/a.out.h (100%)
rename arch/x86/include/{ => uapi}/asm/auxvec.h (100%)
rename arch/x86/include/{ => uapi}/asm/bitsperlong.h (100%)
create mode 100644 arch/x86/include/uapi/asm/boot.h
rename arch/x86/include/{ => uapi}/asm/bootparam.h (100%)
rename arch/x86/include/{ => uapi}/asm/byteorder.h (100%)
create mode 100644 arch/x86/include/uapi/asm/debugreg.h
create mode 100644 arch/x86/include/uapi/asm/e820.h
rename arch/x86/include/{ => uapi}/asm/errno.h (100%)
rename arch/x86/include/{ => uapi}/asm/fcntl.h (100%)
create mode 100644 arch/x86/include/uapi/asm/hw_breakpoint.h
rename arch/x86/include/{ => uapi}/asm/hyperv.h (100%)
rename arch/x86/include/{ => uapi}/asm/ioctl.h (100%)
rename arch/x86/include/{ => uapi}/asm/ioctls.h (100%)
rename arch/x86/include/{ => uapi}/asm/ipcbuf.h (100%)
create mode 100644 arch/x86/include/uapi/asm/ist.h
rename arch/x86/include/{ => uapi}/asm/kvm.h (100%)
create mode 100644 arch/x86/include/uapi/asm/kvm_para.h
rename arch/x86/include/{ => uapi}/asm/ldt.h (100%)
create mode 100644 arch/x86/include/uapi/asm/mce.h
rename arch/x86/include/{ => uapi}/asm/mman.h (100%)
rename arch/x86/include/{ => uapi}/asm/msgbuf.h (100%)
rename arch/x86/include/{ => uapi}/asm/msr-index.h (100%)
create mode 100644 arch/x86/include/uapi/asm/msr.h
create mode 100644 arch/x86/include/uapi/asm/mtrr.h
rename arch/x86/include/{ => uapi}/asm/param.h (100%)
rename arch/x86/include/{ => uapi}/asm/poll.h (100%)
create mode 100644 arch/x86/include/uapi/asm/posix_types.h
rename arch/x86/include/{ => uapi}/asm/posix_types_32.h (100%)
rename arch/x86/include/{ => uapi}/asm/posix_types_64.h (100%)
rename arch/x86/include/{ => uapi}/asm/posix_types_x32.h (100%)
rename arch/x86/include/{ => uapi}/asm/prctl.h (100%)
create mode 100644 arch/x86/include/uapi/asm/processor-flags.h
rename arch/x86/include/{ => uapi}/asm/ptrace-abi.h (100%)
create mode 100644 arch/x86/include/uapi/asm/ptrace.h
rename arch/x86/include/{ => uapi}/asm/resource.h (100%)
rename arch/x86/include/{ => uapi}/asm/sembuf.h (100%)
create mode 100644 arch/x86/include/uapi/asm/setup.h
rename arch/x86/include/{ => uapi}/asm/shmbuf.h (100%)
create mode 100644 arch/x86/include/uapi/asm/sigcontext.h
rename arch/x86/include/{ => uapi}/asm/sigcontext32.h (100%)
rename arch/x86/include/{ => uapi}/asm/siginfo.h (100%)
create mode 100644 arch/x86/include/uapi/asm/signal.h
rename arch/x86/include/{ => uapi}/asm/socket.h (100%)
rename arch/x86/include/{ => uapi}/asm/sockios.h (100%)
rename arch/x86/include/{ => uapi}/asm/stat.h (100%)
rename arch/x86/include/{ => uapi}/asm/statfs.h (100%)
rename arch/x86/include/{ => uapi}/asm/swab.h (100%)
rename arch/x86/include/{ => uapi}/asm/termbits.h (100%)
rename arch/x86/include/{ => uapi}/asm/termios.h (100%)
rename arch/x86/include/{ => uapi}/asm/types.h (100%)
rename arch/x86/include/{ => uapi}/asm/ucontext.h (100%)
create mode 100644 arch/x86/include/uapi/asm/unistd.h
create mode 100644 arch/x86/include/uapi/asm/vm86.h
create mode 100644 arch/x86/include/uapi/asm/vsyscall.h
rename include/{ => uapi}/asm-generic/auxvec.h (100%)
create mode 100644 include/uapi/asm-generic/bitsperlong.h
rename include/{ => uapi}/asm-generic/errno-base.h (100%)
rename include/{ => uapi}/asm-generic/errno.h (100%)
rename include/{ => uapi}/asm-generic/fcntl.h (100%)
create mode 100644 include/uapi/asm-generic/int-l64.h
create mode 100644 include/uapi/asm-generic/int-ll64.h
create mode 100644 include/uapi/asm-generic/ioctl.h
rename include/{ => uapi}/asm-generic/ioctls.h (100%)
rename include/{ => uapi}/asm-generic/ipcbuf.h (100%)
create mode 100644 include/uapi/asm-generic/kvm_para.h
rename include/{ => uapi}/asm-generic/mman-common.h (100%)
rename include/{ => uapi}/asm-generic/mman.h (100%)
rename include/{ => uapi}/asm-generic/msgbuf.h (100%)
create mode 100644 include/uapi/asm-generic/param.h
rename include/{ => uapi}/asm-generic/poll.h (100%)
rename include/{ => uapi}/asm-generic/posix_types.h (100%)
create mode 100644 include/uapi/asm-generic/resource.h
rename include/{ => uapi}/asm-generic/sembuf.h (100%)
rename include/{ => uapi}/asm-generic/setup.h (100%)
rename include/{ => uapi}/asm-generic/shmbuf.h (100%)
rename include/{ => uapi}/asm-generic/shmparam.h (100%)
create mode 100644 include/uapi/asm-generic/siginfo.h
rename include/{ => uapi}/asm-generic/signal-defs.h (100%)
create mode 100644 include/uapi/asm-generic/signal.h
rename include/{ => uapi}/asm-generic/socket.h (100%)
rename include/{ => uapi}/asm-generic/sockios.h (100%)
rename include/{ => uapi}/asm-generic/stat.h (100%)
create mode 100644 include/uapi/asm-generic/statfs.h
rename include/{ => uapi}/asm-generic/swab.h (100%)
rename include/{ => uapi}/asm-generic/termbits.h (100%)
create mode 100644 include/uapi/asm-generic/termios.h
rename include/{ => uapi}/asm-generic/types.h (100%)
rename include/{ => uapi}/asm-generic/ucontext.h (100%)
create mode 100644 include/uapi/asm-generic/unistd.h.
Quoted 12 lines · David Howells
Can you merge the following branch into the x86 tree please.
This is to complete part of the UAPI disintegration for which the preparatory patches were pulled recently.
Note that there are some fixup patches which are at the base of the branch aimed at you, plus all arches get the asm-generic branch merged in too.
The following changes since commit
612a9aab56a93533e76e3ad91642db7033e03b69:Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (2012-10-03 23:29:23 -0700)
Quoted 9 lines
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.gitdisintegrate-x86for you to fetch changes up to
c64630429a9d37a248c6b06a738fad838f2f5e37:UAPI: (Scripted) Disintegrate arch/x86/include/asm (2012-10-04 18:21:45 +0100)
That branch does have generic patches which are not yet in upstream. I presume that is intentional.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
Quoted 2 lines · H. Peter Anvin
That branch does have generic patches which are not yet in upstream. I presume that is intentional.
Yeah. It works better if the generic patches are there first. I thought that as long as everyone pulls the same disintegrate-asm-generic branch at the bottom of their tree, then git merging should work just fine.
OTOH, not everyone is willing to pull their branch in this window, so, if Linus pulls the prep patches and Arnd pushes the asm-generic bits, then the lower layers can go away and everyone gets a branch with only their bits on.
David