From: David Howells <dhowells@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
"H. Peter Anvin" <hpa@linux.intel.com>
Cc: dhowells@redhat.com, Arnd Bergmann <arnd@arndb.de>,
Dave Jones <davej@redhat.com>, Ingo Molnar <mingo@elte.hu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Michael Kerrisk <mtk.manpages@gmail.com>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [GIT PULL] x86/uapi for 3.8
Date: Wed, 12 Dec 2012 23:48:05 +0000 [thread overview]
Message-ID: <23916.1355356085@warthog.procyon.org.uk> (raw)
In-Reply-To: <201212122211.qBCMBRxl027895@terminus.zytor.com>
H. Peter Anvin <hpa@linux.intel.com> wrote:
> 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
Unfortunately, that is broken by Al Viro's mass signalling changes. I've
regenerated it based on Linus's current master. Pull request below.
The same merge conflict with tip/master still exists, I imagine, due to the
changes in tipbot for asm/mce.h, so if tip/master is merged first, then it
might be worth me regenerating my changes.
Should it go via tipbot?
David
---
The following changes since commit 9977d9b379cb77e0f67bd6f4563618106e58e11d:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal (2012-12-12 12:22:13 -0800)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-x86-20121212
for you to fetch changes up to c12519530533e2bdd93e5753bcd565fda35f3df0:
UAPI: (Scripted) Disintegrate arch/x86/include/asm (2012-12-12 22:58:24 +0000)
----------------------------------------------------------------
UAPI disintegration 2012-12-12
----------------------------------------------------------------
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
next prev parent reply other threads:[~2012-12-12 23:48 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 22:11 [GIT PULL] x86/uapi for 3.8 H. Peter Anvin
2012-12-12 23:48 ` David Howells [this message]
2012-12-14 18:25 ` Linus Torvalds
2012-12-14 23:45 ` David Howells
2012-12-15 1:16 ` Linus Torvalds
2012-12-15 1:41 ` Linus Torvalds
2012-12-15 1:47 ` Linus Torvalds
2012-12-15 16:33 ` Markus Trippelsdorf
2012-12-15 16:35 ` Markus Trippelsdorf
2012-12-16 12:43 ` Matt Fleming
2012-12-16 13:25 ` Markus Trippelsdorf
2012-12-16 14:54 ` Matt Fleming
2012-12-16 20:12 ` Linus Torvalds
2012-12-16 22:07 ` Linus Torvalds
2012-12-16 22:25 ` H. Peter Anvin
2012-12-16 22:40 ` Matt Fleming
2012-12-16 22:52 ` Linus Torvalds
2012-12-16 23:49 ` Markus Trippelsdorf
2012-12-15 18:35 ` Linus Torvalds
2012-12-15 19:41 ` H. Peter Anvin
2012-12-15 19:58 ` Linus Torvalds
2012-12-15 20:06 ` Markus Trippelsdorf
2012-12-15 21:04 ` Markus Trippelsdorf
2012-12-15 21:06 ` Linus Torvalds
2012-12-15 21:36 ` H. Peter Anvin
2012-12-15 22:05 ` Yinghai Lu
2012-12-15 23:37 ` Linus Torvalds
2012-12-15 23:46 ` H. Peter Anvin
2012-12-16 12:46 ` Matt Fleming
2012-12-15 21:37 ` Dave Jones
2012-12-15 23:47 ` H. Peter Anvin
2012-12-17 9:04 ` Jan Beulich
2012-12-17 15:44 ` Linus Torvalds
2012-12-17 16:00 ` Jan Beulich
2012-12-17 16:39 ` H. Peter Anvin
2012-12-17 17:03 ` Jan Beulich
2012-12-17 17:15 ` H. Peter Anvin
2012-12-18 8:02 ` Jan Beulich
2012-12-15 4:25 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=23916.1355356085@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=arnd@arndb.de \
--cc=davej@redhat.com \
--cc=hpa@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mtk.manpages@gmail.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.