From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932087Ab2LLWL5 (ORCPT ); Wed, 12 Dec 2012 17:11:57 -0500 Received: from terminus.zytor.com ([198.137.202.10]:53690 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755503Ab2LLWL4 (ORCPT ); Wed, 12 Dec 2012 17:11:56 -0500 Date: Wed, 12 Dec 2012 14:11:27 -0800 Message-Id: <201212122211.qBCMBRxl027895@terminus.zytor.com> From: "H. Peter Anvin" To: Linus Torvalds Subject: [GIT PULL] x86/uapi for 3.8 Cc: Arnd Bergmann , Dave Jones , David Howells , "H. Peter Anvin" , Ingo Molnar , Linux Kernel Mailing List , Michael Kerrisk , "Paul E. McKenney" , Thomas Gleixner X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (terminus.zytor.com [127.0.0.1]); Wed, 12 Dec 2012 14:11:33 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, This is the arch/x86 portion of David Howell's user API splitup. Since this is a "build or fail" type patchset, I consider it to be very low risk. My test merge shows a single merge conflict in arch/x86/include/asm/mce.h; the resolution should simply be to remove the bits from the conflicted merge that are already in arch/x86/include/uapi/asm/mce.h. The following changes since commit 7e5530af11be68f3109672aed59243f82e1272f0: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2012-12-02 16:39:00 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-uapi-for-linus David Howells (1): UAPI: (Scripted) Disintegrate arch/x86/include/asm arch/x86/include/asm/Kbuild | 26 --- 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/svm.h | 132 +------------ arch/x86/include/asm/unistd.h | 14 +-- arch/x86/include/asm/vm86.h | 128 +------------ arch/x86/include/asm/vmx.h | 89 +-------- arch/x86/include/asm/vsyscall.h | 16 +-- arch/x86/include/uapi/asm/Kbuild | 58 ++++++ 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/perf_regs.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/svm.h | 132 ++++++++++++ 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/vmx.h | 109 ++++++++++ arch/x86/include/uapi/asm/vsyscall.h | 17 ++ 78 files changed, 1587 insertions(+), 1428 deletions(-) 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/perf_regs.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%) create mode 100644 arch/x86/include/uapi/asm/svm.h 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/vmx.h create mode 100644 arch/x86/include/uapi/asm/vsyscall.h