* [GIT PULL] Disintegrate UAPI for parisc [ver #2]
@ 2012-10-09 9:15 David Howells
2012-10-16 18:48 ` James Bottomley
0 siblings, 1 reply; 3+ messages in thread
From: David Howells @ 2012-10-09 9:15 UTC (permalink / raw)
To: jejb; +Cc: dhowells, linux-parisc, linux-kernel
Can you merge the following branch into the parisc tree please.
This is to complete part of the UAPI disintegration for which the preparatory
patches were pulled recently.
Now that the fixups and the asm-generic chunk have been merged, I've
regenerated the patches to get rid of those dependencies and to take account of
any changes made so far in the merge window. If you have already pulled the
older version of the branch aimed at you, then please feel free to ignore this
request.
The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-parisc-20121009
for you to fetch changes up to 7869b46c99d8de719f7543d6ba432a7fcc3c78b3:
UAPI: (Scripted) Disintegrate arch/parisc/include/asm (2012-10-09 09:47:22 +0100)
----------------------------------------------------------------
UAPI Disintegration 2012-10-09
----------------------------------------------------------------
David Howells (1):
UAPI: (Scripted) Disintegrate arch/parisc/include/asm
arch/parisc/include/asm/Kbuild | 2 -
arch/parisc/include/asm/pdc.h | 423 +-----------
arch/parisc/include/asm/ptrace.h | 46 +-
arch/parisc/include/asm/signal.h | 113 +--
arch/parisc/include/asm/termios.h | 41 +-
arch/parisc/include/asm/unistd.h | 835 +---------------------
arch/parisc/include/uapi/asm/Kbuild | 32 +
arch/parisc/include/{ => uapi}/asm/auxvec.h | 0
arch/parisc/include/{ => uapi}/asm/bitsperlong.h | 0
arch/parisc/include/{ => uapi}/asm/byteorder.h | 0
arch/parisc/include/{ => uapi}/asm/errno.h | 0
arch/parisc/include/{ => uapi}/asm/fcntl.h | 0
arch/parisc/include/{ => uapi}/asm/ioctl.h | 0
arch/parisc/include/{ => uapi}/asm/ioctls.h | 0
arch/parisc/include/{ => uapi}/asm/ipcbuf.h | 0
arch/parisc/include/{ => uapi}/asm/kvm_para.h | 0
arch/parisc/include/{ => uapi}/asm/mman.h | 0
arch/parisc/include/{ => uapi}/asm/msgbuf.h | 0
arch/parisc/include/{ => uapi}/asm/param.h | 0
arch/parisc/include/uapi/asm/pdc.h | 427 ++++++++++++
arch/parisc/include/{ => uapi}/asm/poll.h | 0
arch/parisc/include/{ => uapi}/asm/posix_types.h | 0
arch/parisc/include/uapi/asm/ptrace.h | 47 ++
arch/parisc/include/{ => uapi}/asm/resource.h | 0
arch/parisc/include/{ => uapi}/asm/sembuf.h | 0
arch/parisc/include/{ => uapi}/asm/setup.h | 0
arch/parisc/include/{ => uapi}/asm/shmbuf.h | 0
arch/parisc/include/{ => uapi}/asm/sigcontext.h | 0
arch/parisc/include/{ => uapi}/asm/siginfo.h | 0
arch/parisc/include/uapi/asm/signal.h | 118 ++++
arch/parisc/include/{ => uapi}/asm/socket.h | 0
arch/parisc/include/{ => uapi}/asm/sockios.h | 0
arch/parisc/include/{ => uapi}/asm/stat.h | 0
arch/parisc/include/{ => uapi}/asm/statfs.h | 0
arch/parisc/include/{ => uapi}/asm/swab.h | 0
arch/parisc/include/{ => uapi}/asm/termbits.h | 0
arch/parisc/include/uapi/asm/termios.h | 43 ++
arch/parisc/include/{ => uapi}/asm/types.h | 0
arch/parisc/include/uapi/asm/unistd.h | 837 +++++++++++++++++++++++
39 files changed, 1511 insertions(+), 1453 deletions(-)
rename arch/parisc/include/{ => uapi}/asm/auxvec.h (100%)
rename arch/parisc/include/{ => uapi}/asm/bitsperlong.h (100%)
rename arch/parisc/include/{ => uapi}/asm/byteorder.h (100%)
rename arch/parisc/include/{ => uapi}/asm/errno.h (100%)
rename arch/parisc/include/{ => uapi}/asm/fcntl.h (100%)
rename arch/parisc/include/{ => uapi}/asm/ioctl.h (100%)
rename arch/parisc/include/{ => uapi}/asm/ioctls.h (100%)
rename arch/parisc/include/{ => uapi}/asm/ipcbuf.h (100%)
rename arch/parisc/include/{ => uapi}/asm/kvm_para.h (100%)
rename arch/parisc/include/{ => uapi}/asm/mman.h (100%)
rename arch/parisc/include/{ => uapi}/asm/msgbuf.h (100%)
rename arch/parisc/include/{ => uapi}/asm/param.h (100%)
create mode 100644 arch/parisc/include/uapi/asm/pdc.h
rename arch/parisc/include/{ => uapi}/asm/poll.h (100%)
rename arch/parisc/include/{ => uapi}/asm/posix_types.h (100%)
create mode 100644 arch/parisc/include/uapi/asm/ptrace.h
rename arch/parisc/include/{ => uapi}/asm/resource.h (100%)
rename arch/parisc/include/{ => uapi}/asm/sembuf.h (100%)
rename arch/parisc/include/{ => uapi}/asm/setup.h (100%)
rename arch/parisc/include/{ => uapi}/asm/shmbuf.h (100%)
rename arch/parisc/include/{ => uapi}/asm/sigcontext.h (100%)
rename arch/parisc/include/{ => uapi}/asm/siginfo.h (100%)
create mode 100644 arch/parisc/include/uapi/asm/signal.h
rename arch/parisc/include/{ => uapi}/asm/socket.h (100%)
rename arch/parisc/include/{ => uapi}/asm/sockios.h (100%)
rename arch/parisc/include/{ => uapi}/asm/stat.h (100%)
rename arch/parisc/include/{ => uapi}/asm/statfs.h (100%)
rename arch/parisc/include/{ => uapi}/asm/swab.h (100%)
rename arch/parisc/include/{ => uapi}/asm/termbits.h (100%)
create mode 100644 arch/parisc/include/uapi/asm/termios.h
rename arch/parisc/include/{ => uapi}/asm/types.h (100%)
create mode 100644 arch/parisc/include/uapi/asm/unistd.h
.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] Disintegrate UAPI for parisc [ver #2]
2012-10-09 9:15 [GIT PULL] Disintegrate UAPI for parisc [ver #2] David Howells
@ 2012-10-16 18:48 ` James Bottomley
2012-10-16 19:08 ` David Howells
0 siblings, 1 reply; 3+ messages in thread
From: James Bottomley @ 2012-10-16 18:48 UTC (permalink / raw)
To: David Howells; +Cc: jejb, linux-parisc, linux-kernel
On Tue, 2012-10-09 at 10:15 +0100, David Howells wrote:
> Can you merge the following branch into the parisc tree please.
>
> This is to complete part of the UAPI disintegration for which the preparatory
> patches were pulled recently.
>
> Now that the fixups and the asm-generic chunk have been merged, I've
> regenerated the patches to get rid of those dependencies and to take account of
> any changes made so far in the merge window. If you have already pulled the
> older version of the branch aimed at you, then please feel free to ignore this
> request.
>
> The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
I'm getting a fairly massive merge failure over our misc tree:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.0 misc
It looks like a conflict with the motion to using wrappered Kbuild for
our asm-generic clones.
James
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] Disintegrate UAPI for parisc [ver #2]
2012-10-16 18:48 ` James Bottomley
@ 2012-10-16 19:08 ` David Howells
0 siblings, 0 replies; 3+ messages in thread
From: David Howells @ 2012-10-16 19:08 UTC (permalink / raw)
To: James Bottomley; +Cc: dhowells, jejb, linux-parisc, linux-kernel
James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> I'm getting a fairly massive merge failure over our misc tree:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.0 misc
>
> It looks like a conflict with the motion to using wrappered Kbuild for
> our asm-generic clones.
I can try merging your branch in and then disintegrating on top of that.
David
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-16 19:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-09 9:15 [GIT PULL] Disintegrate UAPI for parisc [ver #2] David Howells
2012-10-16 18:48 ` James Bottomley
2012-10-16 19:08 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox