Disintegrate UAPI for m68k [ver #2]

Can you merge the following branch into the m68k 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-m68k-20121009

for you to fetch changes up to 10b3a979347d4aba7de19e8d33eb8b87fe2a11dd:

UAPI: (Scripted) Disintegrate arch/m68k/include/asm (2012-10-09 09:47:06 +0100)

----------------------------------------------------------------
UAPI Disintegration 2012-10-09

----------------------------------------------------------------
David Howells (1):
UAPI: (Scripted) Disintegrate arch/m68k/include/asm

 arch/m68k/include/asm/Kbuild                   |   2 -
 arch/m68k/include/asm/ptrace.h                 |  72 +----
 arch/m68k/include/asm/setup.h                  |  82 +-----
 arch/m68k/include/asm/signal.h                 | 118 +-------
 arch/m68k/include/asm/termios.h                |  44 +--
 arch/m68k/include/asm/unistd.h                 | 354 +-----------------------
 arch/m68k/include/uapi/asm/Kbuild              |  23 ++
 arch/m68k/include/{ => uapi}/asm/a.out.h       |   0
 arch/m68k/include/{ => uapi}/asm/auxvec.h      |   0
 arch/m68k/include/{ => uapi}/asm/byteorder.h   |   0
 arch/m68k/include/{ => uapi}/asm/cachectl.h    |   0
 arch/m68k/include/{ => uapi}/asm/fcntl.h       |   0
 arch/m68k/include/{ => uapi}/asm/ioctls.h      |   0
 arch/m68k/include/{ => uapi}/asm/msgbuf.h      |   0
 arch/m68k/include/{ => uapi}/asm/param.h       |   0
 arch/m68k/include/{ => uapi}/asm/poll.h        |   0
 arch/m68k/include/{ => uapi}/asm/posix_types.h |   0
 arch/m68k/include/uapi/asm/ptrace.h            |  79 ++++++
 arch/m68k/include/{ => uapi}/asm/sembuf.h      |   0
 arch/m68k/include/uapi/asm/setup.h             | 103 +++++++
 arch/m68k/include/{ => uapi}/asm/shmbuf.h      |   0
 arch/m68k/include/{ => uapi}/asm/sigcontext.h  |   0
 arch/m68k/include/uapi/asm/signal.h            | 118 ++++++++
 arch/m68k/include/{ => uapi}/asm/socket.h      |   0
 arch/m68k/include/{ => uapi}/asm/sockios.h     |   0
 arch/m68k/include/{ => uapi}/asm/stat.h        |   0
 arch/m68k/include/{ => uapi}/asm/swab.h        |   0
 arch/m68k/include/{ => uapi}/asm/termbits.h    |   0
 arch/m68k/include/uapi/asm/termios.h           |  44 +++
 arch/m68k/include/uapi/asm/unistd.h            | 356 +++++++++++++++++++++++++
 30 files changed, 728 insertions(+), 667 deletions(-)
 rename arch/m68k/include/{ => uapi}/asm/a.out.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/auxvec.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/byteorder.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/cachectl.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/fcntl.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/ioctls.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/msgbuf.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/param.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/poll.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/posix_types.h (100%)
 create mode 100644 arch/m68k/include/uapi/asm/ptrace.h
 rename arch/m68k/include/{ => uapi}/asm/sembuf.h (100%)
 create mode 100644 arch/m68k/include/uapi/asm/setup.h
 rename arch/m68k/include/{ => uapi}/asm/shmbuf.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/sigcontext.h (100%)
 create mode 100644 arch/m68k/include/uapi/asm/signal.h
 rename arch/m68k/include/{ => uapi}/asm/socket.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/sockios.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/stat.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/swab.h (100%)
 rename arch/m68k/include/{ => uapi}/asm/termbits.h (100%)
 create mode 100644 arch/m68k/include/uapi/asm/termios.h
 create mode 100644 arch/m68k/include/uapi/asm/unistd.h

.

Thanks!

I will look into it, but I won't merge it before 3.7-rc1.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

This leaves the following empty construct:

    #ifdef CONFIG_COLDFIRE
    #else
    #endif

I'll remove it in a subsequent patch.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Odd. It emitted it in both headers, which it shouldn't have.

Thanks.

David