Re: [GIT PULL] Disintegrate UAPI for cris [ver #2]

2012-10-12 Thread Jesper Nilsson 
On Tue, Oct 09, 2012 at 10:15:22AM +0100, David Howells wrote:
> Can you merge the following branch into the cris 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.

Looks good here, applied.

Thanks!

/Jesper

>   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-cris-20121009
> 
> for you to fetch changes up to e717abac8a9f65eee6de3bb37e10c6916bced483:
> 
>   UAPI: (Scripted) Disintegrate arch/cris/include/asm (2012-10-09 09:46:45 
> +0100)
> 
> 
> UAPI Disintegration 2012-10-09
> 
> 
> David Howells (3):
>   UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
>   UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
>   UAPI: (Scripted) Disintegrate arch/cris/include/asm
> 
>  arch/cris/include/arch-v10/arch/Kbuild |   4 -
>  arch/cris/include/arch-v32/arch/Kbuild |   2 -
>  arch/cris/include/arch-v32/arch/cryptocop.h| 116 +--
>  arch/cris/include/asm/Kbuild   |   5 -
>  arch/cris/include/asm/ptrace.h |   5 +-
>  arch/cris/include/asm/signal.h | 122 +---
>  arch/cris/include/asm/swab.h   |   3 +-
>  arch/cris/include/asm/termios.h|  43 +--
>  arch/cris/include/asm/types.h  |   5 +-
>  arch/cris/include/asm/unistd.h | 342 +---
>  arch/cris/include/uapi/arch-v10/arch/Kbuild|   4 +
>  .../include/{ => uapi}/arch-v10/arch/sv_addr.agh   |   0
>  .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h  |   0
>  .../cris/include/{ => uapi}/arch-v10/arch/svinto.h |   0
>  arch/cris/include/{ => uapi}/arch-v10/arch/user.h  |   0
>  arch/cris/include/uapi/arch-v32/arch/Kbuild|   2 +
>  arch/cris/include/uapi/arch-v32/arch/cryptocop.h   | 122 
>  arch/cris/include/{ => uapi}/arch-v32/arch/user.h  |   0
>  arch/cris/include/uapi/asm/Kbuild  |  34 ++
>  arch/cris/include/{ => uapi}/asm/auxvec.h  |   0
>  arch/cris/include/{ => uapi}/asm/bitsperlong.h |   0
>  arch/cris/include/{ => uapi}/asm/byteorder.h   |   0
>  arch/cris/include/{ => uapi}/asm/errno.h   |   0
>  arch/cris/include/{ => uapi}/asm/ethernet.h|   0
>  arch/cris/include/{ => uapi}/asm/etraxgpio.h   |   0
>  arch/cris/include/{ => uapi}/asm/fcntl.h   |   0
>  arch/cris/include/{ => uapi}/asm/ioctl.h   |   0
>  arch/cris/include/{ => uapi}/asm/ioctls.h  |   0
>  arch/cris/include/{ => uapi}/asm/ipcbuf.h  |   0
>  arch/cris/include/{ => uapi}/asm/mman.h|   0
>  arch/cris/include/{ => uapi}/asm/msgbuf.h  |   0
>  arch/cris/include/{ => uapi}/asm/param.h   |   0
>  arch/cris/include/{ => uapi}/asm/poll.h|   0
>  arch/cris/include/{ => uapi}/asm/posix_types.h |   0
>  arch/cris/include/uapi/asm/ptrace.h|   1 +
>  arch/cris/include/{ => uapi}/asm/resource.h|   0
>  arch/cris/include/{ => uapi}/asm/rs485.h   |   0
>  arch/cris/include/{ => uapi}/asm/sembuf.h  |   0
>  arch/cris/include/{ => uapi}/asm/setup.h   |   0
>  arch/cris/include/{ => uapi}/asm/shmbuf.h  |   0
>  arch/cris/include/{ => uapi}/asm/sigcontext.h  |   0
>  arch/cris/include/{ => uapi}/asm/siginfo.h |   0
>  arch/cris/include/uapi/asm/signal.h| 122 
>  arch/cris/include/{ => uapi}/asm/socket.h  |   0
>  arch/cris/include/{ => uapi}/asm/sockios.h |   0
>  arch/cris/include/{ => uapi}/asm/stat.h|   0
>  arch/cris/include/{ => uapi}/asm/statfs.h  |   0
>  arch/cris/include/{ => uapi}/asm/sync_serial.h |   0
>  arch/cris/include/{ => uapi}/asm/termbits.h|   0
>  arch/cris/include/uapi/asm/termios.h   |  45 +++
>  arch/cris/include/uapi/asm/types.h |   1 +
>  arch/cris/include/uapi/asm/unistd.h| 344 
> +
>  52 files changed, 682 insertions(+), 640 deletions(-)
>  rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
>  rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
>  rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)

Re: [GIT PULL] Disintegrate UAPI for cris [ver #2]

2012-10-12 Thread Jesper Nilsson 
On Tue, Oct 09, 2012 at 10:15:22AM +0100, David Howells wrote:
 Can you merge the following branch into the cris 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.

Looks good here, applied.

Thanks!

/Jesper

   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-cris-20121009
 
 for you to fetch changes up to e717abac8a9f65eee6de3bb37e10c6916bced483:
 
   UAPI: (Scripted) Disintegrate arch/cris/include/asm (2012-10-09 09:46:45 
 +0100)
 
 
 UAPI Disintegration 2012-10-09
 
 
 David Howells (3):
   UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
   UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
   UAPI: (Scripted) Disintegrate arch/cris/include/asm
 
  arch/cris/include/arch-v10/arch/Kbuild |   4 -
  arch/cris/include/arch-v32/arch/Kbuild |   2 -
  arch/cris/include/arch-v32/arch/cryptocop.h| 116 +--
  arch/cris/include/asm/Kbuild   |   5 -
  arch/cris/include/asm/ptrace.h |   5 +-
  arch/cris/include/asm/signal.h | 122 +---
  arch/cris/include/asm/swab.h   |   3 +-
  arch/cris/include/asm/termios.h|  43 +--
  arch/cris/include/asm/types.h  |   5 +-
  arch/cris/include/asm/unistd.h | 342 +---
  arch/cris/include/uapi/arch-v10/arch/Kbuild|   4 +
  .../include/{ = uapi}/arch-v10/arch/sv_addr.agh   |   0
  .../include/{ = uapi}/arch-v10/arch/sv_addr_ag.h  |   0
  .../cris/include/{ = uapi}/arch-v10/arch/svinto.h |   0
  arch/cris/include/{ = uapi}/arch-v10/arch/user.h  |   0
  arch/cris/include/uapi/arch-v32/arch/Kbuild|   2 +
  arch/cris/include/uapi/arch-v32/arch/cryptocop.h   | 122 
  arch/cris/include/{ = uapi}/arch-v32/arch/user.h  |   0
  arch/cris/include/uapi/asm/Kbuild  |  34 ++
  arch/cris/include/{ = uapi}/asm/auxvec.h  |   0
  arch/cris/include/{ = uapi}/asm/bitsperlong.h |   0
  arch/cris/include/{ = uapi}/asm/byteorder.h   |   0
  arch/cris/include/{ = uapi}/asm/errno.h   |   0
  arch/cris/include/{ = uapi}/asm/ethernet.h|   0
  arch/cris/include/{ = uapi}/asm/etraxgpio.h   |   0
  arch/cris/include/{ = uapi}/asm/fcntl.h   |   0
  arch/cris/include/{ = uapi}/asm/ioctl.h   |   0
  arch/cris/include/{ = uapi}/asm/ioctls.h  |   0
  arch/cris/include/{ = uapi}/asm/ipcbuf.h  |   0
  arch/cris/include/{ = uapi}/asm/mman.h|   0
  arch/cris/include/{ = uapi}/asm/msgbuf.h  |   0
  arch/cris/include/{ = uapi}/asm/param.h   |   0
  arch/cris/include/{ = uapi}/asm/poll.h|   0
  arch/cris/include/{ = uapi}/asm/posix_types.h |   0
  arch/cris/include/uapi/asm/ptrace.h|   1 +
  arch/cris/include/{ = uapi}/asm/resource.h|   0
  arch/cris/include/{ = uapi}/asm/rs485.h   |   0
  arch/cris/include/{ = uapi}/asm/sembuf.h  |   0
  arch/cris/include/{ = uapi}/asm/setup.h   |   0
  arch/cris/include/{ = uapi}/asm/shmbuf.h  |   0
  arch/cris/include/{ = uapi}/asm/sigcontext.h  |   0
  arch/cris/include/{ = uapi}/asm/siginfo.h |   0
  arch/cris/include/uapi/asm/signal.h| 122 
  arch/cris/include/{ = uapi}/asm/socket.h  |   0
  arch/cris/include/{ = uapi}/asm/sockios.h |   0
  arch/cris/include/{ = uapi}/asm/stat.h|   0
  arch/cris/include/{ = uapi}/asm/statfs.h  |   0
  arch/cris/include/{ = uapi}/asm/sync_serial.h |   0
  arch/cris/include/{ = uapi}/asm/termbits.h|   0
  arch/cris/include/uapi/asm/termios.h   |  45 +++
  arch/cris/include/uapi/asm/types.h |   1 +
  arch/cris/include/uapi/asm/unistd.h| 344 
 +
  52 files changed, 682 insertions(+), 640 deletions(-)
  rename arch/cris/include/{ = uapi}/arch-v10/arch/sv_addr.agh (100%)
  rename arch/cris/include/{ = uapi}/arch-v10/arch/sv_addr_ag.h (100%)
  rename arch/cris/include/{ = uapi}/arch-v10/arch/svinto.h (100%)
  rename arch/cris/include/{ = uapi}/arch-v10/arch/user.h (100%)
  create mode 100644

[GIT PULL] Disintegrate UAPI for cris [ver #2]

2012-10-09 Thread David Howells 
Can you merge the following branch into the cris 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-cris-20121009

for you to fetch changes up to e717abac8a9f65eee6de3bb37e10c6916bced483:

  UAPI: (Scripted) Disintegrate arch/cris/include/asm (2012-10-09 09:46:45 
+0100)


UAPI Disintegration 2012-10-09


David Howells (3):
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/asm

 arch/cris/include/arch-v10/arch/Kbuild |   4 -
 arch/cris/include/arch-v32/arch/Kbuild |   2 -
 arch/cris/include/arch-v32/arch/cryptocop.h| 116 +--
 arch/cris/include/asm/Kbuild   |   5 -
 arch/cris/include/asm/ptrace.h |   5 +-
 arch/cris/include/asm/signal.h | 122 +---
 arch/cris/include/asm/swab.h   |   3 +-
 arch/cris/include/asm/termios.h|  43 +--
 arch/cris/include/asm/types.h  |   5 +-
 arch/cris/include/asm/unistd.h | 342 +---
 arch/cris/include/uapi/arch-v10/arch/Kbuild|   4 +
 .../include/{ => uapi}/arch-v10/arch/sv_addr.agh   |   0
 .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h  |   0
 .../cris/include/{ => uapi}/arch-v10/arch/svinto.h |   0
 arch/cris/include/{ => uapi}/arch-v10/arch/user.h  |   0
 arch/cris/include/uapi/arch-v32/arch/Kbuild|   2 +
 arch/cris/include/uapi/arch-v32/arch/cryptocop.h   | 122 
 arch/cris/include/{ => uapi}/arch-v32/arch/user.h  |   0
 arch/cris/include/uapi/asm/Kbuild  |  34 ++
 arch/cris/include/{ => uapi}/asm/auxvec.h  |   0
 arch/cris/include/{ => uapi}/asm/bitsperlong.h |   0
 arch/cris/include/{ => uapi}/asm/byteorder.h   |   0
 arch/cris/include/{ => uapi}/asm/errno.h   |   0
 arch/cris/include/{ => uapi}/asm/ethernet.h|   0
 arch/cris/include/{ => uapi}/asm/etraxgpio.h   |   0
 arch/cris/include/{ => uapi}/asm/fcntl.h   |   0
 arch/cris/include/{ => uapi}/asm/ioctl.h   |   0
 arch/cris/include/{ => uapi}/asm/ioctls.h  |   0
 arch/cris/include/{ => uapi}/asm/ipcbuf.h  |   0
 arch/cris/include/{ => uapi}/asm/mman.h|   0
 arch/cris/include/{ => uapi}/asm/msgbuf.h  |   0
 arch/cris/include/{ => uapi}/asm/param.h   |   0
 arch/cris/include/{ => uapi}/asm/poll.h|   0
 arch/cris/include/{ => uapi}/asm/posix_types.h |   0
 arch/cris/include/uapi/asm/ptrace.h|   1 +
 arch/cris/include/{ => uapi}/asm/resource.h|   0
 arch/cris/include/{ => uapi}/asm/rs485.h   |   0
 arch/cris/include/{ => uapi}/asm/sembuf.h  |   0
 arch/cris/include/{ => uapi}/asm/setup.h   |   0
 arch/cris/include/{ => uapi}/asm/shmbuf.h  |   0
 arch/cris/include/{ => uapi}/asm/sigcontext.h  |   0
 arch/cris/include/{ => uapi}/asm/siginfo.h |   0
 arch/cris/include/uapi/asm/signal.h| 122 
 arch/cris/include/{ => uapi}/asm/socket.h  |   0
 arch/cris/include/{ => uapi}/asm/sockios.h |   0
 arch/cris/include/{ => uapi}/asm/stat.h|   0
 arch/cris/include/{ => uapi}/asm/statfs.h  |   0
 arch/cris/include/{ => uapi}/asm/sync_serial.h |   0
 arch/cris/include/{ => uapi}/asm/termbits.h|   0
 arch/cris/include/uapi/asm/termios.h   |  45 +++
 arch/cris/include/uapi/asm/types.h |   1 +
 arch/cris/include/uapi/asm/unistd.h| 344 +
 52 files changed, 682 insertions(+), 640 deletions(-)
 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
 rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
 rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
 create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
 rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
 rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
 rename arch/cris/include/{ =>

[GIT PULL] Disintegrate UAPI for cris [ver #2]

2012-10-09 Thread David Howells 
Can you merge the following branch into the cris 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-cris-20121009

for you to fetch changes up to e717abac8a9f65eee6de3bb37e10c6916bced483:

  UAPI: (Scripted) Disintegrate arch/cris/include/asm (2012-10-09 09:46:45 
+0100)


UAPI Disintegration 2012-10-09


David Howells (3):
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/asm

 arch/cris/include/arch-v10/arch/Kbuild |   4 -
 arch/cris/include/arch-v32/arch/Kbuild |   2 -
 arch/cris/include/arch-v32/arch/cryptocop.h| 116 +--
 arch/cris/include/asm/Kbuild   |   5 -
 arch/cris/include/asm/ptrace.h |   5 +-
 arch/cris/include/asm/signal.h | 122 +---
 arch/cris/include/asm/swab.h   |   3 +-
 arch/cris/include/asm/termios.h|  43 +--
 arch/cris/include/asm/types.h  |   5 +-
 arch/cris/include/asm/unistd.h | 342 +---
 arch/cris/include/uapi/arch-v10/arch/Kbuild|   4 +
 .../include/{ = uapi}/arch-v10/arch/sv_addr.agh   |   0
 .../include/{ = uapi}/arch-v10/arch/sv_addr_ag.h  |   0
 .../cris/include/{ = uapi}/arch-v10/arch/svinto.h |   0
 arch/cris/include/{ = uapi}/arch-v10/arch/user.h  |   0
 arch/cris/include/uapi/arch-v32/arch/Kbuild|   2 +
 arch/cris/include/uapi/arch-v32/arch/cryptocop.h   | 122 
 arch/cris/include/{ = uapi}/arch-v32/arch/user.h  |   0
 arch/cris/include/uapi/asm/Kbuild  |  34 ++
 arch/cris/include/{ = uapi}/asm/auxvec.h  |   0
 arch/cris/include/{ = uapi}/asm/bitsperlong.h |   0
 arch/cris/include/{ = uapi}/asm/byteorder.h   |   0
 arch/cris/include/{ = uapi}/asm/errno.h   |   0
 arch/cris/include/{ = uapi}/asm/ethernet.h|   0
 arch/cris/include/{ = uapi}/asm/etraxgpio.h   |   0
 arch/cris/include/{ = uapi}/asm/fcntl.h   |   0
 arch/cris/include/{ = uapi}/asm/ioctl.h   |   0
 arch/cris/include/{ = uapi}/asm/ioctls.h  |   0
 arch/cris/include/{ = uapi}/asm/ipcbuf.h  |   0
 arch/cris/include/{ = uapi}/asm/mman.h|   0
 arch/cris/include/{ = uapi}/asm/msgbuf.h  |   0
 arch/cris/include/{ = uapi}/asm/param.h   |   0
 arch/cris/include/{ = uapi}/asm/poll.h|   0
 arch/cris/include/{ = uapi}/asm/posix_types.h |   0
 arch/cris/include/uapi/asm/ptrace.h|   1 +
 arch/cris/include/{ = uapi}/asm/resource.h|   0
 arch/cris/include/{ = uapi}/asm/rs485.h   |   0
 arch/cris/include/{ = uapi}/asm/sembuf.h  |   0
 arch/cris/include/{ = uapi}/asm/setup.h   |   0
 arch/cris/include/{ = uapi}/asm/shmbuf.h  |   0
 arch/cris/include/{ = uapi}/asm/sigcontext.h  |   0
 arch/cris/include/{ = uapi}/asm/siginfo.h |   0
 arch/cris/include/uapi/asm/signal.h| 122 
 arch/cris/include/{ = uapi}/asm/socket.h  |   0
 arch/cris/include/{ = uapi}/asm/sockios.h |   0
 arch/cris/include/{ = uapi}/asm/stat.h|   0
 arch/cris/include/{ = uapi}/asm/statfs.h  |   0
 arch/cris/include/{ = uapi}/asm/sync_serial.h |   0
 arch/cris/include/{ = uapi}/asm/termbits.h|   0
 arch/cris/include/uapi/asm/termios.h   |  45 +++
 arch/cris/include/uapi/asm/types.h |   1 +
 arch/cris/include/uapi/asm/unistd.h| 344 +
 52 files changed, 682 insertions(+), 640 deletions(-)
 rename arch/cris/include/{ = uapi}/arch-v10/arch/sv_addr.agh (100%)
 rename arch/cris/include/{ = uapi}/arch-v10/arch/sv_addr_ag.h (100%)
 rename arch/cris/include/{ = uapi}/arch-v10/arch/svinto.h (100%)
 rename arch/cris/include/{ = uapi}/arch-v10/arch/user.h (100%)
 create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
 rename arch/cris/include/{ = uapi}/arch-v32/arch/user.h (100%)
 rename arch/cris/include/{ = uapi}/asm/auxvec.h (100%)
 rename arch/cris/include/{ = uapi}/asm/bitsperlong.h (100%)
 rename

[GIT PULL] Disintegrate UAPI for cris

2012-10-04 Thread David Howells 
Can you merge the following branch into the cris 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-cris

for you to fetch changes up to 4816d1b7a51526bc4722731d5516c295a9c72a1c:

  UAPI: (Scripted) Disintegrate arch/cris/include/asm (2012-10-04 18:20:35 
+0100)


David Howells (8):
  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/cris/include/arch-v10/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/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/cris/include/arch-v10/arch/Kbuild |   4 -
 arch/cris/include/arch-v32/arch/Kbuild |   2 -
 arch/cris/include/arch-v32/arch/cryptocop.h| 116 +--
 arch/cris/include/asm/Kbuild   |   6 -
 arch/cris/include/asm/ptrace.h |   5 +-
 arch/cris/include/asm/signal.h | 122 +--
 arch/cris/include/asm/swab.h   |   3 +-
 arch/cris/include/asm/termios.h|  43 +-
 arch/cris/include/asm/types.h  |   5 +-
 arch/cris/include/asm/unistd.h | 342 +---
 arch/cris/include/uapi/arch-v10/arch/Kbuild|   4 +
 .../include/{ => uapi}/arch-v10/arch/sv_addr.agh   |   0
 .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h  |   0
 .../cris/include/{ => uapi}/arch-v10/arch/svinto.h |   0
 arch/cris/include/{ => uapi}/arch-v10/arch/user.h  |   0
 arch/cris/include/uapi/arch-v32/arch/Kbuild|   2 +
 arch/cris/include/uapi/arch-v32/arch/cryptocop.h   | 122 +++
 arch/cris/include/{ => uapi}/arch-v32/arch/user.h  |   0
 arch/cris/include/uapi/asm/Kbuild  |  34 +
 arch/cris/include/{ => uapi}/asm/auxvec.h  |   0
 arch/cris/include/{ => uapi}/asm/bitsperlong.h |   0
 arch/cris/include/{ => uapi}/asm/byteorder.h   |   0
 arch/cris/include/{ => uapi}/asm/errno.h   |   0
 arch/cris/include/{ => uapi}/asm/ethernet.h|   0
 arch/cris/include/{ => uapi}/asm/etraxgpio.h   |   0
 arch/cris/include/{ => uapi}/asm/fcntl.h   |   0
 arch/cris/include/{ => uapi}/asm/ioctl.h   |   0
 arch/cris/include/{ => uapi}/asm/ioctls.h  |   0
 arch/cris/include/{ => uapi}/asm/ipcbuf.h  |   0
 arch/cris/include/{ => uapi}/asm/mman.h|   0
 arch/cris/include/{ => uapi}/asm/msgbuf.h  |   0
 arch/cris/include/{ => uapi}/asm/param.h   |   0
 arch/cris/include/{ => uapi}/asm/poll.h|   0
 arch/cris/include/{ => uapi}/asm/posix_types.h |   0
 arch/cris/include/uapi/asm/ptrace.h|   1 +
 arch/cris/include/{ => uapi}/asm/resource.h|   0
 arch/cris/include/{ => uapi}/asm/rs485.h   |   0
 arch/cris/include/{ => uapi}/asm/sembuf.h  |   0
 arch/cris/include/{ => uapi}/asm/setup.h   |   0
 arch/cris/include/{ => uapi}/asm/shmbuf.h  |   0
 arch/cris/include/{ => uapi}/asm/sigcontext.h  |   0
 arch/cris/include/{ => uapi}/asm/siginfo.h |   0
 arch/cris/include/uapi/asm/signal.h| 122 +++
 arch/cris/include/{ => uapi}/asm/socket.h  |   0
 arch/cris/include/{ => uapi}/asm/sockios.h |   0
 arch/cris/include/{ => uapi}/asm/stat.h|   0
 arch/cris/include/{ => uapi}/asm/statfs.h  |   0
 arch/cris/include/{ => uapi}/asm/sync_serial.h |   0
 arch/cris/include/{ => uapi}/asm/termbits.h|   0
 arch/cris/include/uapi/asm/termios.h   |  45 +
 arch/cris/include/uapi/asm/types.h |   1 +

[GIT PULL] Disintegrate UAPI for cris

2012-10-04 Thread David Howells 
Can you merge the following branch into the cris 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-cris

for you to fetch changes up to 4816d1b7a51526bc4722731d5516c295a9c72a1c:

  UAPI: (Scripted) Disintegrate arch/cris/include/asm (2012-10-04 18:20:35 
+0100)


David Howells (8):
  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/cris/include/arch-v10/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/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/cris/include/arch-v10/arch/Kbuild |   4 -
 arch/cris/include/arch-v32/arch/Kbuild |   2 -
 arch/cris/include/arch-v32/arch/cryptocop.h| 116 +--
 arch/cris/include/asm/Kbuild   |   6 -
 arch/cris/include/asm/ptrace.h |   5 +-
 arch/cris/include/asm/signal.h | 122 +--
 arch/cris/include/asm/swab.h   |   3 +-
 arch/cris/include/asm/termios.h|  43 +-
 arch/cris/include/asm/types.h  |   5 +-
 arch/cris/include/asm/unistd.h | 342 +---
 arch/cris/include/uapi/arch-v10/arch/Kbuild|   4 +
 .../include/{ = uapi}/arch-v10/arch/sv_addr.agh   |   0
 .../include/{ = uapi}/arch-v10/arch/sv_addr_ag.h  |   0
 .../cris/include/{ = uapi}/arch-v10/arch/svinto.h |   0
 arch/cris/include/{ = uapi}/arch-v10/arch/user.h  |   0
 arch/cris/include/uapi/arch-v32/arch/Kbuild|   2 +
 arch/cris/include/uapi/arch-v32/arch/cryptocop.h   | 122 +++
 arch/cris/include/{ = uapi}/arch-v32/arch/user.h  |   0
 arch/cris/include/uapi/asm/Kbuild  |  34 +
 arch/cris/include/{ = uapi}/asm/auxvec.h  |   0
 arch/cris/include/{ = uapi}/asm/bitsperlong.h |   0
 arch/cris/include/{ = uapi}/asm/byteorder.h   |   0
 arch/cris/include/{ = uapi}/asm/errno.h   |   0
 arch/cris/include/{ = uapi}/asm/ethernet.h|   0
 arch/cris/include/{ = uapi}/asm/etraxgpio.h   |   0
 arch/cris/include/{ = uapi}/asm/fcntl.h   |   0
 arch/cris/include/{ = uapi}/asm/ioctl.h   |   0
 arch/cris/include/{ = uapi}/asm/ioctls.h  |   0
 arch/cris/include/{ = uapi}/asm/ipcbuf.h  |   0
 arch/cris/include/{ = uapi}/asm/mman.h|   0
 arch/cris/include/{ = uapi}/asm/msgbuf.h  |   0
 arch/cris/include/{ = uapi}/asm/param.h   |   0
 arch/cris/include/{ = uapi}/asm/poll.h|   0
 arch/cris/include/{ = uapi}/asm/posix_types.h |   0
 arch/cris/include/uapi/asm/ptrace.h|   1 +
 arch/cris/include/{ = uapi}/asm/resource.h|   0
 arch/cris/include/{ = uapi}/asm/rs485.h   |   0
 arch/cris/include/{ = uapi}/asm/sembuf.h  |   0
 arch/cris/include/{ = uapi}/asm/setup.h   |   0
 arch/cris/include/{ = uapi}/asm/shmbuf.h  |   0
 arch/cris/include/{ = uapi}/asm/sigcontext.h  |   0
 arch/cris/include/{ = uapi}/asm/siginfo.h |   0
 arch/cris/include/uapi/asm/signal.h| 122 +++
 arch/cris/include/{ = uapi}/asm/socket.h  |   0
 arch/cris/include/{ = uapi}/asm/sockios.h |   0
 arch/cris/include/{ = uapi}/asm/stat.h|   0
 arch/cris/include/{ = uapi}/asm/statfs.h  |   0
 arch/cris/include/{ = uapi}/asm/sync_serial.h |   0
 arch/cris/include/{ = uapi}/asm/termbits.h|   0
 arch/cris/include/uapi/asm/termios.h   |  45 +
 arch/cris/include/uapi/asm/types.h |   1 +
 arch/cris/include/uapi/asm/unistd.h