Can you merge the following branch into the xtensa 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-xtensa for you to fetch changes up to 3d47e44c3c53cb397e38a459171348d9b501a66e: UAPI: (Scripted) Disintegrate arch/xtensa/include/asm (2012-10-04 18:21:48 +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/xtensa/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/xtensa/include/asm/Kbuild | 1 - arch/xtensa/include/asm/param.h | 20 +- arch/xtensa/include/asm/ptrace.h | 66 +- arch/xtensa/include/asm/signal.h | 134 +--- arch/xtensa/include/asm/termios.h | 43 +- arch/xtensa/include/asm/types.h | 15 +- arch/xtensa/include/asm/unistd.h | 698 +---------------- arch/xtensa/include/uapi/asm/Kbuild | 31 + arch/xtensa/include/{ => uapi}/asm/auxvec.h | 0 arch/xtensa/include/{ => uapi}/asm/bitsperlong.h | 0 arch/xtensa/include/{ => uapi}/asm/byteorder.h | 0 arch/xtensa/include/{ => uapi}/asm/errno.h | 0 arch/xtensa/include/{ => uapi}/asm/fcntl.h | 0 arch/xtensa/include/{ => uapi}/asm/ioctl.h | 0 arch/xtensa/include/{ => uapi}/asm/ioctls.h | 0 arch/xtensa/include/{ => uapi}/asm/ipcbuf.h | 0 arch/xtensa/include/{ => uapi}/asm/kvm_para.h | 0 arch/xtensa/include/{ => uapi}/asm/mman.h | 0 arch/xtensa/include/{ => uapi}/asm/msgbuf.h | 0 arch/xtensa/include/uapi/asm/param.h | 30 + arch/xtensa/include/{ => uapi}/asm/poll.h | 0 arch/xtensa/include/{ => uapi}/asm/posix_types.h | 0 arch/xtensa/include/uapi/asm/ptrace.h | 77 ++ arch/xtensa/include/{ => uapi}/asm/resource.h | 0 arch/xtensa/include/{ => uapi}/asm/sembuf.h | 0 arch/xtensa/include/{ => uapi}/asm/setup.h | 0 arch/xtensa/include/{ => uapi}/asm/shmbuf.h | 0 arch/xtensa/include/{ => uapi}/asm/sigcontext.h | 0 arch/xtensa/include/{ => uapi}/asm/siginfo.h | 0 arch/xtensa/include/uapi/asm/signal.h | 148 ++++ arch/xtensa/include/{ => uapi}/asm/socket.h | 0 arch/xtensa/include/{ => uapi}/asm/sockios.h | 0 arch/xtensa/include/{ => uapi}/asm/stat.h | 0 arch/xtensa/include/{ => uapi}/asm/statfs.h | 0 arch/xtensa/include/{ => uapi}/asm/swab.h | 0 arch/xtensa/include/{ => uapi}/asm/termbits.h | 0 arch/xtensa/include/uapi/asm/termios.h | 56 ++ arch/xtensa/include/uapi/asm/types.h | 28 + arch/xtensa/include/uapi/asm/unistd.h | 709 ++++++++++++++++++ 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 +- 102 files changed, 2879 insertions(+), 2763 deletions(-) delete mode 100644 arch/c6x/include/asm/signal.h rename arch/xtensa/include/{ => uapi}/asm/auxvec.h (100%) rename arch/xtensa/include/{ => uapi}/asm/bitsperlong.h (100%) rename arch/xtensa/include/{ => uapi}/asm/byteorder.h (100%) rename arch/xtensa/include/{ => uapi}/asm/errno.h (100%) rename arch/xtensa/include/{ => uapi}/asm/fcntl.h (100%) rename arch/xtensa/include/{ => uapi}/asm/ioctl.h (100%) rename arch/xtensa/include/{ => uapi}/asm/ioctls.h (100%) rename arch/xtensa/include/{ => uapi}/asm/ipcbuf.h (100%) rename arch/xtensa/include/{ => uapi}/asm/kvm_para.h (100%) rename arch/xtensa/include/{ => uapi}/asm/mman.h (100%) rename arch/xtensa/include/{ => uapi}/asm/msgbuf.h (100%) create mode 100644 arch/xtensa/include/uapi/asm/param.h rename arch/xtensa/include/{ => uapi}/asm/poll.h (100%) rename arch/xtensa/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 arch/xtensa/include/uapi/asm/ptrace.h rename arch/xtensa/include/{ => uapi}/asm/resource.h (100%) rename arch/xtensa/include/{ => uapi}/asm/sembuf.h (100%) rename arch/xtensa/include/{ => uapi}/asm/setup.h (100%) rename arch/xtensa/include/{ => uapi}/asm/shmbuf.h (100%) rename arch/xtensa/include/{ => uapi}/asm/sigcontext.h (100%) rename arch/xtensa/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 arch/xtensa/include/uapi/asm/signal.h rename arch/xtensa/include/{ => uapi}/asm/socket.h (100%) rename arch/xtensa/include/{ => uapi}/asm/sockios.h (100%) rename arch/xtensa/include/{ => uapi}/asm/stat.h (100%) rename arch/xtensa/include/{ => uapi}/asm/statfs.h (100%) rename arch/xtensa/include/{ => uapi}/asm/swab.h (100%) rename arch/xtensa/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 arch/xtensa/include/uapi/asm/termios.h create mode 100644 arch/xtensa/include/uapi/asm/types.h create mode 100644 arch/xtensa/include/uapi/asm/unistd.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 . -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/